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 }); }