Refactorying membership service ReadSettings as GetSettings

--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4040315

src/Orchard.Web/Packages/Orchard.Users/Services/MembershipService.cs

@@ -18,8 +18,10 @@ namespace Orchard.Users.Services {
 
         public ILogger Logger { get; set; }
 
-        public void ReadSettings(MembershipSettings settings) {
+        public MembershipSettings GetSettings() {
+            var settings = new MembershipSettings();
             // accepting defaults
+            return settings;
         }
 
         public IUser CreateUser(CreateUserParams createUserParams) {

src/Orchard/Controllers/AccountController.cs

@@ -50,9 +50,7 @@ namespace Orchard.Controllers {
 
         int MinPasswordLength {
             get {
-                var settings = new MembershipSettings();
+                return _membershipService.GetSettings().MinRequiredPasswordLength;
-                _membershipService.ReadSettings(settings);
-                return settings.MinRequiredPasswordLength;
             }
         }
 

src/Orchard/Orchard.csproj

@@ -206,9 +206,6 @@
     <Compile Include="Validation\JetBrains.Annotations.cs" />
     <Compile Include="IMapper.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="Security\app.config" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

src/Orchard/Security/IMembershipService.cs

@@ -6,7 +6,7 @@ using System.Web.Security;
 
 namespace Orchard.Security {
     public interface IMembershipService : IDependency {
-        void ReadSettings(MembershipSettings settings);
+        MembershipSettings GetSettings();
 
         IUser CreateUser(CreateUserParams createUserParams);
         IUser GetUser(string username);
@@ -15,6 +15,19 @@ namespace Orchard.Security {
     }
 
     public class MembershipSettings {
+        public MembershipSettings() {
+            EnablePasswordRetrieval = false;
+            EnablePasswordReset = true;
+            RequiresQuestionAndAnswer = true;
+            RequiresUniqueEmail = true;
+            MaxInvalidPasswordAttempts = 5;
+            PasswordAttemptWindow = 10;
+            MinRequiredPasswordLength = 7;
+            MinRequiredNonAlphanumericCharacters = 1;
+            PasswordStrengthRegularExpression = "";
+            PasswordFormat = MembershipPasswordFormat.Hashed;
+        }
+
         public bool EnablePasswordRetrieval { get; set; }
         public bool EnablePasswordReset { get; set; }
         public bool RequiresQuestionAndAnswer { get; set; }

src/Orchard/Security/Providers/OrchardMembershipProvider.cs

@@ -10,20 +10,7 @@ namespace Orchard.Security.Providers {
         }
 
         static MembershipSettings GetSettings() {
-            var settings = new MembershipSettings {
+            return GetService().GetSettings();
-                EnablePasswordRetrieval = false,
-                EnablePasswordReset = true,
-                RequiresQuestionAndAnswer = true,
-                RequiresUniqueEmail = true,
-                MaxInvalidPasswordAttempts = 5,
-                PasswordAttemptWindow = 10,
-                MinRequiredPasswordLength = 7,
-                MinRequiredNonAlphanumericCharacters = 1,
-                PasswordStrengthRegularExpression = "",
-                PasswordFormat = MembershipPasswordFormat.Hashed,
-            };
-            GetService().ReadSettings(settings);
-            return settings;
         }
 
         private MembershipUser BuildMembershipUser(IUser user) {