Browse Source

Delete all duplicate grants in ResourcePermissionManager.DeleteAsync

pull/26209/head
maliming 2 months ago
parent
commit
769ccc472e
No known key found for this signature in database GPG Key ID: A646B9CB645ECEA4
  1. 4
      modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/ResourcePermissionManager.cs
  2. 35
      modules/permission-management/test/Volo.Abp.PermissionManagement.Domain.Tests/Volo/Abp/PermissionManagement/ResourcePermissionManager_Tests.cs

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

@ -375,8 +375,8 @@ public class ResourcePermissionManager : IResourcePermissionManager, ISingletonD
throw new AbpException($"The resource permission management provider '{providerName}' is not available in the current context.");
}
var permissionGrant = await ResourcePermissionGrantRepository.FindAsync(name, resourceName, resourceKey, providerName, providerKey);
if (permissionGrant != null)
var permissionGrants = await ResourcePermissionGrantRepository.GetListAsync(new[] { name }, resourceName, resourceKey, providerName, providerKey);
foreach (var permissionGrant in permissionGrants)
{
await ResourcePermissionGrantRepository.DeleteAsync(permissionGrant, true);
}

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

@ -341,6 +341,41 @@ public class ResourcePermissionManager_Tests : PermissionTestBase
"Test")).ShouldBeNull();
}
[Fact]
public async Task DeleteByNameAsync_Should_Delete_Duplicate_Host_Grants()
{
for (var i = 0; i < 2; i++)
{
await _resourcePermissionGrantRepository.InsertAsync(new ResourcePermissionGrant(
Guid.NewGuid(),
"MyResourcePermission1",
TestEntityResource.ResourceName,
TestEntityResource.ResourceKey1,
"Test",
"Test")
);
}
(await _resourcePermissionGrantRepository.GetListAsync(new[] { "MyResourcePermission1" },
TestEntityResource.ResourceName,
TestEntityResource.ResourceKey1,
"Test",
"Test")).Count.ShouldBe(2);
await _resourcePermissionManager.DeleteAsync(
"MyResourcePermission1",
TestEntityResource.ResourceName,
TestEntityResource.ResourceKey1,
"Test",
"Test");
(await _resourcePermissionGrantRepository.FindAsync(
"MyResourcePermission1",
TestEntityResource.ResourceName,
TestEntityResource.ResourceKey1,
"Test",
"Test")).ShouldBeNull();
}
[Fact]
public async Task GetProviderKeyLookupServicesAsync_Should_Not_Return_Unavailable_Services()
{

Loading…
Cancel
Save