From da9015764305c8f4a27a5f50ca35e0d74eca9c1d Mon Sep 17 00:00:00 2001
From: Enis Necipoglu <iletisim@enisnecipoglu.com>
Date: Thu, 10 Aug 2023 17:30:39 +0300
Subject: [PATCH 1/2] Add equal spaces for top & bottom for Blazor toolbar

---
 .../Layout/PageHeader.razor                                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index e6959f1d3a..2bb222feb8 100644
--- 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>
                 }

From 39805fd03176adf9afadef607049741ebbe0ecbf Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Mon, 14 Aug 2023 09:15:26 +0800
Subject: [PATCH 2/2] Output security logs correctly.

Resolve #17361
---
 .../Controllers/TokenController.Password.cs      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Controllers/TokenController.Password.cs b/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Controllers/TokenController.Password.cs
index 33b01a7449..9617d4f409 100644
--- a/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Controllers/TokenController.Password.cs
+++ b/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Controllers/TokenController.Password.cs
@@ -96,6 +96,14 @@ public partial class TokenController
                 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 @@ public partial class TokenController
                     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);
             }
         }