changed verification key timeout duration from int to time span

brockallen · Jul 25, 2014 · 24c2fbb · 24c2fbb
1 parent 8ece291
commit 24c2fbb
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/src/BrockAllen.MembershipReboot.Test/Configuration/SecuritySettingsTests.cs b/src/BrockAllen.MembershipReboot.Test/Configuration/SecuritySettingsTests.cs
@@ -26,6 +26,7 @@ public void TestDefaults()
             Assert.AreEqual(true, settings.AllowAccountDeletion);
             Assert.AreEqual(0, settings.PasswordHashingIterationCount);
             Assert.AreEqual(0, settings.PasswordResetFrequency);
+            Assert.AreEqual(TimeSpan.FromMinutes(20), settings.VerificationKeyStaleDuration);
         }
     }
 }
diff --git a/src/BrockAllen.MembershipReboot/AccountService/UserAccountService.cs b/src/BrockAllen.MembershipReboot/AccountService/UserAccountService.cs
@@ -1965,7 +1965,7 @@ protected virtual bool IsVerificationKeyStale(TAccount account)
                 return true;
             }
 
-            if (account.VerificationKeySent < UtcNow.AddMinutes(-Configuration.VerificationKeyStaleDurationMinutes))
+            if (account.VerificationKeySent < UtcNow.Subtract(Configuration.VerificationKeyStaleDuration))
             {
                 return true;
             }

diff --git a/src/BrockAllen.MembershipReboot/Configuration/MembershipRebootConfiguration.cs b/src/BrockAllen.MembershipReboot/Configuration/MembershipRebootConfiguration.cs
@@ -30,7 +30,7 @@ public MembershipRebootConfiguration(SecuritySettings securitySettings)
             this.AllowAccountDeletion = securitySettings.AllowAccountDeletion;
             this.PasswordHashingIterationCount = securitySettings.PasswordHashingIterationCount;
             this.PasswordResetFrequency = securitySettings.PasswordResetFrequency;
-            this.VerificationKeyStaleDurationMinutes = securitySettings.VerificationKeyStaleDurationMinutes;
+            this.VerificationKeyStaleDuration = securitySettings.VerificationKeyStaleDuration;
 
             this.Crypto = new DefaultCrypto();
         }
@@ -46,7 +46,7 @@ public MembershipRebootConfiguration(SecuritySettings securitySettings)
         public bool AllowAccountDeletion { get; set; }
         public int PasswordHashingIterationCount { get; set; }
         public int PasswordResetFrequency { get; set; }
-        public int VerificationKeyStaleDurationMinutes { get; set; }
+        public TimeSpan VerificationKeyStaleDuration { get; set; }
 
         AggregateValidator<TAccount> usernameValidators = new AggregateValidator<TAccount>();
         public void RegisterUsernameValidator(params IValidator<TAccount>[] items)

diff --git a/src/BrockAllen.MembershipReboot/Configuration/SecuritySettings.cs b/src/BrockAllen.MembershipReboot/Configuration/SecuritySettings.cs
@@ -130,10 +130,10 @@ public int PasswordResetFrequency
             set { this[PASSWORDRESETFREQUENCY] = value; }
         }
 
-        [ConfigurationProperty(VERIFICATIONKEYSTALEDURATIONMINUTES, DefaultValue = MembershipRebootConstants.UserAccount.VerificationKeyStaleDurationMinutes)]
-        public int VerificationKeyStaleDurationMinutes
+        [ConfigurationProperty(VERIFICATIONKEYSTALEDURATIONMINUTES, DefaultValue = MembershipRebootConstants.SecuritySettingDefaults.VerificationKeyStaleDuration)]
+        public TimeSpan VerificationKeyStaleDuration
         {
-            get { return (int)this[VERIFICATIONKEYSTALEDURATIONMINUTES]; }
+            get { return (TimeSpan)this[VERIFICATIONKEYSTALEDURATIONMINUTES]; }
             set { this[VERIFICATIONKEYSTALEDURATIONMINUTES] = value; }
         }
     }

diff --git a/src/BrockAllen.MembershipReboot/Constants/MembershipRebootConstants.cs b/src/BrockAllen.MembershipReboot/Constants/MembershipRebootConstants.cs
@@ -26,11 +26,11 @@ public class SecuritySettingDefaults
             internal const bool AllowAccountDeletion = true;
             internal const int PasswordHashingIterationCount = 0;
             internal const int PasswordResetFrequency = 0;
+            internal const string VerificationKeyStaleDuration = "00:20:00";
         }
 
         public class UserAccount
         {
-            internal const int VerificationKeyStaleDurationMinutes = 20;
             internal const int MobileCodeLength = 6;
             internal const int MobileCodeResendDelayMinutes = 1;
             internal const int MobileCodeStaleDurationMinutes = 10;