Merge branch 'release/6.34.0'

VirtoCommerce · Nov 20, 2023 · d8f9028 · d8f9028
2 parents 1429b28 + 978cd58
commit d8f9028
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -7,7 +7,7 @@
     <Authors>VirtoCommerce</Authors>
   </PropertyGroup>
    <PropertyGroup>
-    <VersionPrefix>6.33.0</VersionPrefix>
+    <VersionPrefix>6.34.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
   </PropertyGroup>

diff --git a/VirtoCommerce.Storefront/Controllers/AccountController.cs b/VirtoCommerce.Storefront/Controllers/AccountController.cs
@@ -121,10 +121,11 @@ private async Task SignOutAndSignInAsync(User user)
             await SetLastLoginDate(user);
         }
 
-        private async Task SetLastLoginDate(User user)
+        private Task SetLastLoginDate(User user)
         {
             user.LastLoginDate = DateTime.UtcNow;
-            await _signInManager.UserManager.UpdateAsync(user);
+            user.AccessFailedCount = 0;
+            return _signInManager.UserManager.UpdateAsync(user);
         }
     }
 }
diff --git a/VirtoCommerce.Storefront/Controllers/Api/ApiAccountController.cs b/VirtoCommerce.Storefront/Controllers/Api/ApiAccountController.cs
@@ -528,10 +528,11 @@ private async Task<NotificationSendResult> SendNotificationAsync(NotificationBas
             return result;
         }
 
-        private async Task SetLastLoginDate(User user)
+        private Task SetLastLoginDate(User user)
         {
             user.LastLoginDate = DateTime.UtcNow;
-            await _signInManager.UserManager.UpdateAsync(user);
+            user.AccessFailedCount = 0;
+            return _signInManager.UserManager.UpdateAsync(user);
         }
 
         // GET: storefrontapi/account/passwordrequirements