fix bug in authenticate related to logging in before account is verif…

…ied. #496
brockallen · Feb 10, 2015 · da3ad4f · da3ad4f
1 parent 270debb
commit da3ad4f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/BrockAllen.MembershipReboot.Test/AccountService/UserAccountServiceTests.cs b/src/BrockAllen.MembershipReboot.Test/AccountService/UserAccountServiceTests.cs
@@ -2467,8 +2467,20 @@ public void SendUsernameReminder_EmailIsNotUnique_Fails()
                 Assert.Fail();
             }
             catch (InvalidOperationException) { }
-
         }
 
+        [TestMethod]
+        public void Logging_in_before_account_is_verified_does_not_cause_account_to_have_last_login_set()
+        {
+            configuration.RequireAccountVerification = true;
+
+            var acct = subject.CreateAccount("test", "pass", "test@test.com");
+
+            var result = subject.Authenticate("test", "pass");
+            Assert.IsFalse(result);
+
+            acct = subject.GetByID(acct.ID);
+            Assert.IsTrue(acct.IsNew());
+        }
     }
 }
diff --git a/src/BrockAllen.MembershipReboot/AccountService/UserAccountService.cs b/src/BrockAllen.MembershipReboot/AccountService/UserAccountService.cs
@@ -902,7 +902,7 @@ protected virtual bool Authenticate(TAccount account, string password)
                     {
                         Tracing.Error("[UserAccountService.Authenticate] failed -- account not verified");
                         this.AddEvent(new AccountNotVerifiedEvent<TAccount>() { Account = account });
-                        result = false;
+                        return false;
                     }
 
                     Tracing.Verbose("[UserAccountService.Authenticate] authentication success");