Merge pull request #6623 from abpframework/revert-6480-maliming/PermissionStore

Revert "Use IPermissionStore in PermissionManagementProvider"

modules/identity/src/Volo.Abp.PermissionManagement.Domain.Identity/Volo/Abp/PermissionManagement/Identity/RolePermissionManagementProvider.cs

@@ -15,13 +15,11 @@ namespace Volo.Abp.PermissionManagement.Identity
 
         public RolePermissionManagementProvider(
             IPermissionGrantRepository permissionGrantRepository,
-            IPermissionStore permissionStore,
             IGuidGenerator guidGenerator,
             ICurrentTenant currentTenant,
             IUserRoleFinder userRoleFinder)
             : base(
                 permissionGrantRepository,
-                permissionStore,
                 guidGenerator,
                 currentTenant)
         {
@@ -33,7 +31,7 @@ namespace Volo.Abp.PermissionManagement.Identity
             if (providerName == Name)
             {
                 return new PermissionValueProviderGrantInfo(
-                    await PermissionStore.IsGrantedAsync(name, providerName, providerKey),
+                    await PermissionGrantRepository.FindAsync(name, providerName, providerKey) != null,
                     providerKey
                 );
             }

modules/identity/src/Volo.Abp.PermissionManagement.Domain.Identity/Volo/Abp/PermissionManagement/Identity/UserPermissionManagementProvider.cs

@@ -9,17 +9,15 @@ namespace Volo.Abp.PermissionManagement.Identity
         public override string Name => UserPermissionValueProvider.ProviderName;
 
         public UserPermissionManagementProvider(
-            IPermissionGrantRepository permissionGrantRepository,
-            IPermissionStore permissionStore,
+            IPermissionGrantRepository permissionGrantRepository, 
             IGuidGenerator guidGenerator,
-            ICurrentTenant currentTenant)
+            ICurrentTenant currentTenant) 
             : base(
                 permissionGrantRepository,
-                permissionStore,
                 guidGenerator,
                 currentTenant)
         {
 
         }
     }
-}
+}

modules/identityserver/src/Volo.Abp.PermissionManagement.Domain.IdentityServer/Volo/Abp/PermissionManagement/IdentityServer/ClientPermissionManagementProvider.cs

@@ -11,12 +11,10 @@ namespace Volo.Abp.PermissionManagement.IdentityServer
 
         public ClientPermissionManagementProvider(
             IPermissionGrantRepository permissionGrantRepository,
-            IPermissionStore permissionStore,
             IGuidGenerator guidGenerator,
             ICurrentTenant currentTenant)
             : base(
                 permissionGrantRepository,
-                permissionStore,
                 guidGenerator,
                 currentTenant)
         {

modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionManagementProvider.cs

@@ -1,5 +1,4 @@
 using System.Threading.Tasks;
-using Volo.Abp.Authorization.Permissions;
 using Volo.Abp.Guids;
 using Volo.Abp.MultiTenancy;
 
@@ -11,24 +10,20 @@ namespace Volo.Abp.PermissionManagement
 
         protected IPermissionGrantRepository PermissionGrantRepository { get; }
 
-        protected IPermissionStore PermissionStore { get; }
-
         protected IGuidGenerator GuidGenerator { get; }
 
         protected ICurrentTenant CurrentTenant { get; }
 
         protected PermissionManagementProvider(
             IPermissionGrantRepository permissionGrantRepository,
-            IPermissionStore permissionStore,
             IGuidGenerator guidGenerator,
             ICurrentTenant currentTenant)
         {
             PermissionGrantRepository = permissionGrantRepository;
-            PermissionStore = permissionStore;
             GuidGenerator = guidGenerator;
             CurrentTenant = currentTenant;
         }
-
+        
         public virtual async Task<PermissionValueProviderGrantInfo> CheckAsync(string name, string providerName, string providerKey)
         {
             if (providerName != Name)
@@ -37,7 +32,7 @@ namespace Volo.Abp.PermissionManagement
             }
 
             return new PermissionValueProviderGrantInfo(
-                await PermissionStore.IsGrantedAsync(name, providerName, providerKey),
+                await PermissionGrantRepository.FindAsync(name, providerName, providerKey) != null,
                 providerKey
             );
         }
@@ -79,4 +74,4 @@ namespace Volo.Abp.PermissionManagement
             await PermissionGrantRepository.DeleteAsync(permissionGrant);
         }
     }
-}
+}

modules/permission-management/test/Volo.Abp.PermissionManagement.TestBase/Volo/Abp/PermissionManagement/TestPermissionManagementProvider.cs

@@ -1,4 +1,6 @@
-using Volo.Abp.Authorization.Permissions;
+using System;
+using System.Collections.Generic;
+using System.Text;
 using Volo.Abp.Guids;
 using Volo.Abp.MultiTenancy;
 
@@ -10,12 +12,10 @@ namespace Volo.Abp.PermissionManagement
 
         public TestPermissionManagementProvider(
             IPermissionGrantRepository permissionGrantRepository,
-            IPermissionStore permissionStore,
             IGuidGenerator guidGenerator,
             ICurrentTenant currentTenant)
             : base(
                 permissionGrantRepository,
-                permissionStore,
                 guidGenerator,
                 currentTenant)
         {