Merge pull request #10170 from abpframework/auto-merge/rel-4-4/561

Merge branch dev with rel-4.4

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

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