Merge pull request #17363 from abpframework/auto-merge/rel-7-3/2118

Merge branch dev with rel-7.3
abpframework · Aug 14, 2023 · c462ee0 · c462ee0
2 parents bc58baf + a3c2b16
commit c462ee0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/Layout/PageHeader.razor b/framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/Layout/PageHeader.razor
@@ -50,7 +50,7 @@
 
                 @foreach (var toolbarItemRender in ToolbarItemRenders)
                 {
-                    <Column ColumnSize="ColumnSize.IsAuto" Class="px-1 pt-2">
+                    <Column ColumnSize="ColumnSize.IsAuto" Class="px-1 py-2">
                         @toolbarItemRender
                     </Column>
                 }

diff --git a/...olo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Controllers/TokenController.Password.cs b/...olo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Controllers/TokenController.Password.cs
@@ -96,6 +96,14 @@ await IdentitySecurityLogManager.SaveAsync(new IdentitySecurityLogContext()
                 var result = await SignInManager.CheckPasswordSignInAsync(user, request.Password, true);
                 if (!result.Succeeded)
                 {
+                    await IdentitySecurityLogManager.SaveAsync(new IdentitySecurityLogContext
+                    {
+                        Identity = OpenIddictSecurityLogIdentityConsts.OpenIddict,
+                        Action = result.ToIdentitySecurityLogAction(),
+                        UserName = request.Username,
+                        ClientId = request.ClientId
+                    });
+
                     string errorDescription;
                     if (result.IsLockedOut)
                     {
@@ -138,14 +146,6 @@ await IdentitySecurityLogManager.SaveAsync(new IdentitySecurityLogContext()
                     return await HandleTwoFactorLoginAsync(request, user);
                 }
 
-                await IdentitySecurityLogManager.SaveAsync(new IdentitySecurityLogContext
-                {
-                    Identity = OpenIddictSecurityLogIdentityConsts.OpenIddict,
-                    Action = result.ToIdentitySecurityLogAction(),
-                    UserName = request.Username,
-                    ClientId = request.ClientId
-                });
-
                 return await SetSuccessResultAsync(request, user);
             }
         }