From 833c4c16eae932e084114504fac4f8a0a532a17e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Thu, 4 Mar 2021 11:56:09 +0300
Subject: [PATCH] Should invalidate the cache for old permission provider key.

---
 .../PermissionGrantCacheItemInvalidator.cs    |  4 +++-
 .../PermissionManagement/PermissionManager.cs | 22 ++++++++++++++++---
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionGrantCacheItemInvalidator.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionGrantCacheItemInvalidator.cs
index 9e73e59b79..585c0a0559 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionGrantCacheItemInvalidator.cs
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionGrantCacheItemInvalidator.cs
@@ -7,7 +7,9 @@ using Volo.Abp.MultiTenancy;
 
 namespace Volo.Abp.PermissionManagement
 {
-    public class PermissionGrantCacheItemInvalidator : ILocalEventHandler<EntityChangedEventData<PermissionGrant>>, ITransientDependency
+    public class PermissionGrantCacheItemInvalidator : 
+        ILocalEventHandler<EntityChangedEventData<PermissionGrant>>, 
+        ITransientDependency
     {
         protected ICurrentTenant CurrentTenant { get; }
 
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionManager.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionManager.cs
index fc8da0c6c5..1f1e28dfd4 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionManager.cs
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionManager.cs
@@ -5,6 +5,7 @@ using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Volo.Abp.Authorization.Permissions;
+using Volo.Abp.Caching;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Guids;
 using Volo.Abp.MultiTenancy;
@@ -24,6 +25,8 @@ namespace Volo.Abp.PermissionManagement
         protected IReadOnlyList<IPermissionManagementProvider> ManagementProviders => _lazyProviders.Value;
 
         protected PermissionManagementOptions Options { get; }
+        
+        protected IDistributedCache<PermissionGrantCacheItem> Cache { get; }
 
         private readonly Lazy<List<IPermissionManagementProvider>> _lazyProviders;
 
@@ -33,10 +36,12 @@ namespace Volo.Abp.PermissionManagement
             IServiceProvider serviceProvider,
             IGuidGenerator guidGenerator,
             IOptions<PermissionManagementOptions> options,
-            ICurrentTenant currentTenant)
+            ICurrentTenant currentTenant, 
+            IDistributedCache<PermissionGrantCacheItem> cache)
         {
             GuidGenerator = guidGenerator;
             CurrentTenant = currentTenant;
+            Cache = cache;
             PermissionGrantRepository = permissionGrantRepository;
             PermissionDefinitionManager = permissionDefinitionManager;
             Options = options.Value;
@@ -104,9 +109,21 @@ namespace Volo.Abp.PermissionManagement
 
             await provider.SetAsync(permissionName, providerKey, isGranted);
         }
-
+        
         public virtual async Task<PermissionGrant> UpdateProviderKeyAsync(PermissionGrant permissionGrant, string providerKey)
         {
+            using (CurrentTenant.Change(permissionGrant.TenantId))
+            {
+                //Invalidating the cache for the old key
+                await Cache.RemoveAsync(
+                    PermissionGrantCacheItem.CalculateCacheKey(
+                        permissionGrant.Name,
+                        permissionGrant.ProviderName,
+                        permissionGrant.ProviderKey
+                    )
+                );
+            }
+            
             permissionGrant.ProviderKey = providerKey;
             return await PermissionGrantRepository.UpdateAsync(permissionGrant);
         }
@@ -114,7 +131,6 @@ namespace Volo.Abp.PermissionManagement
         public virtual async Task DeleteAsync(string providerName, string providerKey)
         {
             var permissionGrants = await PermissionGrantRepository.GetListAsync(providerName, providerKey);
-            //TODO: Use DeleteManyAsync method
             foreach (var permissionGrant in permissionGrants)
             {
                 await PermissionGrantRepository.DeleteAsync(permissionGrant);