Merge pull request #4855 from abpframework/maliming/PermissionDataSeedContributor

Filter permission provider in PermissionDataSeedContributor.

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

@@ -30,6 +30,7 @@ namespace Volo.Abp.PermissionManagement
             var permissionNames = PermissionDefinitionManager
                 .GetPermissions()
                 .Where(p => p.MultiTenancySide.HasFlag(multiTenancySide))
+                .Where(p => !p.Providers.Any() || p.Providers.Contains(RolePermissionValueProvider.ProviderName))
                 .Select(p => p.Name)
                 .ToArray();
 

modules/permission-management/test/Volo.Abp.PermissionManagement.Domain.Tests/Volo/Abp/PermissionManagement/PermissionDataSeedContributor_Tests.cs

@@ -0,0 +1,32 @@
+using System.Threading.Tasks;
+using Shouldly;
+using Volo.Abp.Authorization.Permissions;
+using Volo.Abp.Data;
+using Xunit;
+
+namespace Volo.Abp.PermissionManagement
+{
+    public class PermissionDataSeedContributor_Tests : PermissionTestBase
+    {
+        private readonly PermissionDataSeedContributor _permissionDataSeedContributor;
+        private readonly IPermissionGrantRepository _grantpermissionGrantRepository;
+
+        public PermissionDataSeedContributor_Tests()
+        {
+            _permissionDataSeedContributor = GetRequiredService<PermissionDataSeedContributor>();
+            _grantpermissionGrantRepository = GetRequiredService<IPermissionGrantRepository>();
+        }
+
+        [Fact]
+        public async Task SeedAsync()
+        {
+            (await _grantpermissionGrantRepository.FindAsync("MyPermission1", RolePermissionValueProvider.ProviderName, "admin")).ShouldBeNull();
+            (await _grantpermissionGrantRepository.FindAsync("MyPermission4", RolePermissionValueProvider.ProviderName, "admin")).ShouldBeNull();
+
+            await _permissionDataSeedContributor.SeedAsync(new DataSeedContext(null));
+
+            (await _grantpermissionGrantRepository.FindAsync("MyPermission1", RolePermissionValueProvider.ProviderName, "admin")).ShouldNotBeNull();
+            (await _grantpermissionGrantRepository.FindAsync("MyPermission4", RolePermissionValueProvider.ProviderName, "admin")).ShouldBeNull();
+        }
+    }
+}

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

@@ -16,6 +16,8 @@ namespace Volo.Abp.PermissionManagement
             myPermission2.AddChild("MyPermission2.ChildPermission1");
 
             testGroup.AddPermission("MyPermission3", multiTenancySide: MultiTenancySides.Host);
+
+            testGroup.AddPermission("MyPermission4", multiTenancySide: MultiTenancySides.Host).WithProviders(UserPermissionValueProvider.ProviderName);
         }
     }
-}
+}