Merge pull request #2599 from mperk/#215-role-name-should-be-unchangeable

#215 role name should be unchangeable

modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRole.cs

@@ -100,6 +100,22 @@ namespace Volo.Abp.Identity
             Claims.RemoveAll(c => c.ClaimType == claim.Type && c.ClaimValue == claim.Value);
         }
 
+        public virtual void ChangeName(string name)
+        {
+            Check.NotNullOrWhiteSpace(name, nameof(name));
+
+            var oldName = Name;
+            Name = name;
+
+            AddLocalEvent(
+                new IdentityRoleNameChangedEvent
+                {
+                    IdentityRole = this,
+                    OldName = oldName
+                }
+            );
+        }
+
         public override string ToString()
         {
             return $"{base.ToString()}, Name = {Name}";

modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRoleNameChangedEvent.cs

@@ -0,0 +1,8 @@
+namespace Volo.Abp.Identity
+{
+    public class IdentityRoleNameChangedEvent
+    {
+        public IdentityRole IdentityRole { get; set; }
+        public string OldName { get; set; }
+    }
+}

modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRoleStore.cs

@@ -165,7 +165,7 @@ namespace Volo.Abp.Identity
 
             Check.NotNull(role, nameof(role));
 
-            role.Name = roleName;
+            role.ChangeName(roleName);
             return Task.CompletedTask;
         }
 

modules/identity/src/Volo.Abp.PermissionManagement.Domain.Identity/Volo.Abp.PermissionManagement.Domain.Identity.csproj

@@ -16,6 +16,7 @@
   <ItemGroup>
     <ProjectReference Include="..\Volo.Abp.Identity.Domain.Shared\Volo.Abp.Identity.Domain.Shared.csproj" />
     <ProjectReference Include="..\..\..\permission-management\src\Volo.Abp.PermissionManagement.Domain\Volo.Abp.PermissionManagement.Domain.csproj" />
+    <ProjectReference Include="..\Volo.Abp.Identity.Domain\Volo.Abp.Identity.Domain.csproj" />
   </ItemGroup>
 
 </Project>

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

@@ -0,0 +1,43 @@
+using System.Threading.Tasks;
+using Volo.Abp.Authorization.Permissions;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Domain.Entities.Events;
+using Volo.Abp.EventBus;
+using Volo.Abp.Identity;
+
+namespace Volo.Abp.PermissionManagement.Identity
+{
+    public class RoleUpdateEventHandler :
+        ILocalEventHandler<IdentityRoleNameChangedEvent>,
+        ITransientDependency
+    {
+        protected IIdentityRoleRepository RoleRepository { get; }
+        protected IPermissionManager PermissionManager { get; }
+        protected IPermissionGrantRepository PermissionGrantRepository { get; }
+
+        public RoleUpdateEventHandler(
+            IIdentityRoleRepository roleRepository,
+            IPermissionManager permissionManager,
+            IPermissionGrantRepository permissionGrantRepository)
+        {
+            RoleRepository = roleRepository;
+            PermissionManager = permissionManager;
+            PermissionGrantRepository = permissionGrantRepository;
+        }
+
+        public async Task HandleEventAsync(IdentityRoleNameChangedEvent eventData)
+        {
+            var role = await RoleRepository.FindAsync(eventData.IdentityRole.Id, false).ConfigureAwait(false);
+            if (role == null)
+            {
+                return;
+            }
+
+            var permissionGrantsInRole = await PermissionGrantRepository.GetListAsync(RolePermissionValueProvider.ProviderName, eventData.OldName).ConfigureAwait(false);
+            foreach (var permissionGrant in permissionGrantsInRole)
+            {
+                await PermissionManager.UpdateProviderKeyAsync(permissionGrant, eventData.IdentityRole.Name).ConfigureAwait(false);
+            }
+        }
+    }
+}

modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/RoleChangingEvents_Test.cs

@@ -0,0 +1,58 @@
+using Microsoft.AspNetCore.Identity;
+using Shouldly;
+using System.Threading.Tasks;
+using Volo.Abp.EventBus.Distributed;
+using Volo.Abp.Guids;
+using Volo.Abp.PermissionManagement;
+using Volo.Abp.Uow;
+using Xunit;
+
+namespace Volo.Abp.Identity
+{
+    public class RoleChangingEvents_Test : AbpIdentityDomainTestBase
+    {
+        protected readonly IIdentityRoleRepository RoleRepository;
+        protected readonly IPermissionGrantRepository PermissionGrantRepository;
+        protected readonly IdentityRoleManager RoleManager;
+        protected readonly ILookupNormalizer LookupNormalizer;
+        protected readonly IGuidGenerator GuidGenerator;
+        protected readonly IUnitOfWorkManager UowManager;
+
+        public RoleChangingEvents_Test()
+        {
+            RoleRepository = GetRequiredService<IIdentityRoleRepository>(); ;
+            PermissionGrantRepository = GetRequiredService<IPermissionGrantRepository>(); ;
+            RoleManager = GetRequiredService<IdentityRoleManager>(); ;
+            LookupNormalizer = GetRequiredService<ILookupNormalizer>(); ;
+            GuidGenerator = GetRequiredService<IGuidGenerator>();
+            UowManager = GetRequiredService<IUnitOfWorkManager>();
+        }
+
+        [Fact]
+        public async Task Role_Update_Event_Test()
+        {
+            var role = await RoleRepository
+                                .FindByNormalizedNameAsync(LookupNormalizer.NormalizeName("moderator"))
+                                .ConfigureAwait(false);
+
+            var permissionGrantsInRole = await PermissionGrantRepository.GetListAsync("R", role.Name).ConfigureAwait(false);
+            permissionGrantsInRole.ShouldNotBeNull();
+            permissionGrantsInRole.Count.ShouldBeGreaterThan(0);
+            var count = permissionGrantsInRole.Count;
+
+            using (var uow = UowManager.Begin())
+            {
+                var identityResult = await RoleManager.SetRoleNameAsync(role, "TestModerator").ConfigureAwait(false);
+                identityResult.Succeeded.ShouldBeTrue();
+                var xx = await RoleRepository.UpdateAsync(role).ConfigureAwait(false);
+                await uow.CompleteAsync().ConfigureAwait(false);
+            }
+
+            role = await RoleRepository.GetAsync(role.Id).ConfigureAwait(false);
+            role.Name.ShouldBe("TestModerator");
+
+            permissionGrantsInRole = await PermissionGrantRepository.GetListAsync("R", role.Name).ConfigureAwait(false);
+            permissionGrantsInRole.Count.ShouldBe(count);
+        }
+    }
+}

modules/permission-management/Volo.Abp.PermissionManagement.sln

@@ -19,7 +19,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.PermissionManageme
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.PermissionManagement.Web", "src\Volo.Abp.PermissionManagement.Web\Volo.Abp.PermissionManagement.Web.csproj", "{97A386F8-DAE0-4BEA-ADE5-1D57C3336515}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.PermissionManagement.Tests", "test\Volo.Abp.PermissionManagement.Tests\Volo.Abp.PermissionManagement.Tests.csproj", "{48297098-79D0-413B-939C-6C432142C42D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.PermissionManagement.Domain.Tests", "test\Volo.Abp.PermissionManagement.Tests\Volo.Abp.PermissionManagement.Domain.Tests.csproj", "{48297098-79D0-413B-939C-6C432142C42D}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.PermissionManagement.TestBase", "test\Volo.Abp.PermissionManagement.TestBase\Volo.Abp.PermissionManagement.TestBase.csproj", "{49259427-CAEB-4FAE-81E4-848F789487EA}"
 EndProject
@@ -33,7 +33,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.PermissionManageme
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.PermissionManagement.HttpApi.Client", "src\Volo.Abp.PermissionManagement.HttpApi.Client\Volo.Abp.PermissionManagement.HttpApi.Client.csproj", "{1CD80519-9431-48DB-B0EA-291A73FF9F49}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.PermissionManagement.Application.Tests", "test\Volo.Abp.PermissionManagement.Application.Tests\Volo.Abp.PermissionManagement.Application.Tests.csproj", "{A0F72F5F-3713-4E06-ADB7-15ADFDCB79B1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.PermissionManagement.Application.Tests", "test\Volo.Abp.PermissionManagement.Application.Tests\Volo.Abp.PermissionManagement.Application.Tests.csproj", "{A0F72F5F-3713-4E06-ADB7-15ADFDCB79B1}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

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

@@ -13,5 +13,7 @@ namespace Volo.Abp.PermissionManagement
         Task<List<PermissionWithGrantedProviders>> GetAllAsync([NotNull] string providerName, [NotNull] string providerKey);
 
         Task SetAsync(string permissionName, string providerName, string providerKey, bool isGranted);
+
+        Task<PermissionGrant> UpdateProviderKeyAsync(PermissionGrant permissionGrant, string providerKey);
     }
 }

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

@@ -17,7 +17,7 @@ namespace Volo.Abp.PermissionManagement
         public virtual string ProviderName { get; protected set; }
 
         [CanBeNull]
-        public virtual string ProviderKey { get; protected set; }
+        public virtual string ProviderKey { get; protected internal set; }
 
         protected PermissionGrant()
         {

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

@@ -99,6 +99,12 @@ namespace Volo.Abp.PermissionManagement
             await provider.SetAsync(permissionName, providerKey, isGranted).ConfigureAwait(false);
         }
 
+        public async Task<PermissionGrant> UpdateProviderKeyAsync(PermissionGrant permissionGrant, string providerKey)
+        {
+            permissionGrant.ProviderKey = providerKey;
+            return await PermissionGrantRepository.UpdateAsync(permissionGrant).ConfigureAwait(false);
+        }
+
         protected virtual async Task<PermissionWithGrantedProviders> GetInternalAsync(PermissionDefinition permission, string providerName, string providerKey)
         {
             var result = new PermissionWithGrantedProviders(permission.Name, false);

modules/permission-management/test/Volo.Abp.PermissionManagement.Application.Tests/Volo.Abp.PermissionManagement.Application.Tests.csproj

@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Volo.Abp.PermissionManagement.Application\Volo.Abp.PermissionManagement.Application.csproj" />
-    <ProjectReference Include="..\Volo.Abp.PermissionManagement.Tests\Volo.Abp.PermissionManagement.Tests.csproj" />
+    <ProjectReference Include="..\Volo.Abp.PermissionManagement.Tests\Volo.Abp.PermissionManagement.Domain.Tests.csproj" />
   </ItemGroup>
 
 </Project>

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

@@ -104,5 +104,20 @@ namespace Volo.Abp.PermissionManagement
                 true).ConfigureAwait(false)).ConfigureAwait(false);
         }
 
+        [Fact]
+        public async Task UpdateProviderKey()
+        {
+            await _permissionGrantRepository.InsertAsync(new PermissionGrant(
+                Guid.NewGuid(),
+                "MyPermission1",
+                "Test",
+                "Test")
+            ).ConfigureAwait(false);
+            var permissionGrant = await _permissionGrantRepository.FindAsync("MyPermission1", "Test", "Test").ConfigureAwait(false);
+            permissionGrant.ProviderKey.ShouldBe("Test");
+
+            await _permissionManager.UpdateProviderKeyAsync(permissionGrant, "NewProviderKey").ConfigureAwait(false);
+            (await _permissionGrantRepository.FindAsync("MyPermission1", "Test", "NewProviderKey").ConfigureAwait(false)).ShouldNotBeNull();
+        }
     }
 }