Port fix for aspnet/Identity#1870

aspnet · Jul 11, 2018 · c32a435 · c32a435
1 parent a24b776
commit c32a435
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/src/Microsoft.AspNet.Identity.Owin/SignInManager.cs b/src/Microsoft.AspNet.Identity.Owin/SignInManager.cs
@@ -212,12 +212,16 @@ public async Task<SignInStatus> ExternalSignInAsync(ExternalLoginInfo loginInfo,
             return await SignInOrTwoFactor(user, isPersistent).WithCurrentCulture();
         }
 
+        private async Task<bool> IsTwoFactorEnabled(TUser user)
+        {
+            return await UserManager.GetTwoFactorEnabledAsync(user.Id).WithCurrentCulture()
+                && (await UserManager.GetValidTwoFactorProvidersAsync(user.Id).WithCurrentCulture()).Count > 0;
+        }
+
         private async Task<SignInStatus> SignInOrTwoFactor(TUser user, bool isPersistent)
         {
             var id = Convert.ToString(user.Id);
-            if (await UserManager.GetTwoFactorEnabledAsync(user.Id).WithCurrentCulture()
-                && (await UserManager.GetValidTwoFactorProvidersAsync(user.Id).WithCurrentCulture()).Count > 0
-                && !await AuthenticationManager.TwoFactorBrowserRememberedAsync(id).WithCurrentCulture())
+            if (await IsTwoFactorEnabled(user) && !await AuthenticationManager.TwoFactorBrowserRememberedAsync(id).WithCurrentCulture())
             {
                 var identity = new ClaimsIdentity(DefaultAuthenticationTypes.TwoFactorCookie);
                 identity.AddClaim(new Claim(ClaimTypes.NameIdentifier, id));
@@ -253,7 +257,10 @@ public virtual async Task<SignInStatus> PasswordSignInAsync(string userName, str
             }
             if (await UserManager.CheckPasswordAsync(user, password).WithCurrentCulture())
             {
-                await UserManager.ResetAccessFailedCountAsync(user.Id).WithCurrentCulture();
+                if (!await IsTwoFactorEnabled(user))
+                {
+                    await UserManager.ResetAccessFailedCountAsync(user.Id).WithCurrentCulture();
+                }
                 return await SignInOrTwoFactor(user, isPersistent).WithCurrentCulture();
             }
             if (shouldLockout)