From b35ceadcc7934b9fea0b748162156a2cdbe47737 Mon Sep 17 00:00:00 2001
From: maliming <6908465+maliming@users.noreply.github.com>
Date: Thu, 20 Aug 2020 11:37:09 +0800
Subject: [PATCH] Add UserName & ClientId to the security log.

Resolve #5120
---
 .../AbpResourceOwnerPasswordValidator.cs              | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AspNetIdentity/AbpResourceOwnerPasswordValidator.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AspNetIdentity/AbpResourceOwnerPasswordValidator.cs
index ecbf391ad3..0263e34740 100644
--- a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AspNetIdentity/AbpResourceOwnerPasswordValidator.cs
+++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AspNetIdentity/AbpResourceOwnerPasswordValidator.cs
@@ -63,6 +63,7 @@ namespace Volo.Abp.IdentityServer.AspNetIdentity
         [UnitOfWork]
         public virtual async Task ValidateAsync(ResourceOwnerPasswordValidationContext context)
         {
+            var clientId = context.Request?.Client?.ClientId;
             using var scope = ServiceScopeFactory.CreateScope();
 
             await ReplaceEmailToUsernameOfInputIfNeeds(context);
@@ -91,7 +92,8 @@ namespace Volo.Abp.IdentityServer.AspNetIdentity
                     {
                         Identity = IdentityServerSecurityLogIdentityConsts.IdentityServer,
                         Action = IdentityServerSecurityLogActionConsts.LoginSucceeded,
-                        UserName = context.UserName
+                        UserName = context.UserName,
+                        ClientId = clientId
                     }
                 );
             }
@@ -154,7 +156,8 @@ namespace Volo.Abp.IdentityServer.AspNetIdentity
                 {
                     Identity = IdentityServerSecurityLogIdentityConsts.IdentityServer,
                     Action = result.ToIdentitySecurityLogAction(),
-                    UserName = context.UserName
+                    UserName = context.UserName,
+                    ClientId = clientId
                 });
             }
             else
@@ -166,7 +169,9 @@ namespace Volo.Abp.IdentityServer.AspNetIdentity
                 await IdentitySecurityLogManager.SaveAsync(new IdentitySecurityLogContext()
                 {
                     Identity = IdentityServerSecurityLogIdentityConsts.IdentityServer,
-                    Action = IdentityServerSecurityLogActionConsts.LoginInvalidUserName
+                    Action = IdentityServerSecurityLogActionConsts.LoginInvalidUserName,
+                    UserName = context.UserName,
+                    ClientId = clientId
                 });
             }