From a367a785cfd99191a3f66dc28fd0f44858f6b458 Mon Sep 17 00:00:00 2001 From: maliming Date: Wed, 29 Sep 2021 15:34:53 +0800 Subject: [PATCH 1/2] Add `ImpersonatorUserId` and `ImpersonatorTenantId` to `AuditLogInfo` --- .../src/Volo.Abp.Auditing/Volo/Abp/Auditing/AuditingHelper.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AuditingHelper.cs b/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AuditingHelper.cs index 4c3ede4ca8..58f7c9c7c7 100644 --- a/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AuditingHelper.cs +++ b/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AuditingHelper.cs @@ -136,8 +136,8 @@ namespace Volo.Abp.Auditing UserName = CurrentUser.UserName, ClientId = CurrentClient.Id, CorrelationId = CorrelationIdProvider.Get(), - //ImpersonatorUserId = AbpSession.ImpersonatorUserId, //TODO: Impersonation system is not available yet! - //ImpersonatorTenantId = AbpSession.ImpersonatorTenantId, + ImpersonatorUserId = CurrentUser.FindImpersonatorUserId(), + ImpersonatorTenantId = CurrentUser.FindImpersonatorTenantId(), ExecutionTime = Clock.Now }; From cd8b048df239ce2a1fdd6302681ba4a3df305f88 Mon Sep 17 00:00:00 2001 From: maliming Date: Wed, 29 Sep 2021 16:08:16 +0800 Subject: [PATCH 2/2] Remove `throw new NotImplementedException();`. --- .../test/Volo.CmsKit.TestBase/CmsKitFakeCurrentUser.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitFakeCurrentUser.cs b/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitFakeCurrentUser.cs index ba9c492889..700a805561 100644 --- a/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitFakeCurrentUser.cs +++ b/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitFakeCurrentUser.cs @@ -32,22 +32,22 @@ namespace Volo.CmsKit public Claim FindClaim(string claimType) { - throw new NotImplementedException(); + return null; } public Claim[] FindClaims(string claimType) { - throw new NotImplementedException(); + return null; } public Claim[] GetAllClaims() { - throw new NotImplementedException(); + return null; } public bool IsInRole(string roleName) { - throw new NotImplementedException(); + return false; } } }