Browse Source

Merge pull request #26486 from abpframework/maliming/resource-permission-provider-filter

Filter resource permissions by provider when reading and saving
rel-10.7
Engincan VESKE 4 days ago
committed by GitHub
parent
commit
34f55c694c
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 4
      modules/permission-management/src/Volo.Abp.PermissionManagement.Application.Contracts/Volo/Abp/PermissionManagement/ResourcePermissionDefinitionDto.cs
  2. 9
      modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo/Abp/PermissionManagement/PermissionAppService.cs
  3. 21
      modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/ResourcePermissionManagementModal.razor.cs
  4. 21
      modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/ResourcePermissionManagementModal.razor.cs
  5. 2
      modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/AddResourcePermissionManagementModal.cshtml
  6. 28
      modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/add-resource-permission-management-modal.js
  7. 204
      modules/permission-management/test/Volo.Abp.PermissionManagement.Application.Tests/Volo/Abp/PermissionManagement/PermissionAppService_ResourcePermission_Tests.cs
  8. 10
      modules/permission-management/test/Volo.Abp.PermissionManagement.Application.Tests/Volo/Abp/PermissionManagement/PermissionAppService_Tests.cs
  9. 36
      modules/permission-management/test/Volo.Abp.PermissionManagement.Domain.Tests/Volo/Abp/PermissionManagement/ResourcePermissionManager_Tests.cs
  10. 3
      modules/permission-management/test/Volo.Abp.PermissionManagement.Domain.Tests/Volo/Abp/PermissionManagement/ResourcePermissionStore_Tests.cs
  11. 1
      modules/permission-management/test/Volo.Abp.PermissionManagement.TestBase/Volo/Abp/PermissionManagement/TestResourcePermissionDefinitionProvider.cs
  12. 3
      modules/permission-management/test/Volo.Abp.PermissionManagement.TestBase/Volo/Abp/PermissionManagement/TestResourcePermissionProviderKeyLookupService.cs
  13. 13
      npm/ng-packs/packages/permission-management/proxy/src/lib/proxy/generate-proxy.json
  14. 1
      npm/ng-packs/packages/permission-management/proxy/src/lib/proxy/models.ts
  15. 5
      npm/ng-packs/packages/permission-management/src/lib/components/resource-permission-management/resource-permission-form/resource-permission-form.component.html
  16. 13
      npm/ng-packs/packages/permission-management/src/lib/services/resource-permission-state.service.ts
  17. 59
      npm/ng-packs/packages/permission-management/src/lib/tests/resource-permission-state.service.spec.ts

4
modules/permission-management/src/Volo.Abp.PermissionManagement.Application.Contracts/Volo/Abp/PermissionManagement/ResourcePermissionDefinitionDto.cs

@ -1,3 +1,5 @@
using System.Collections.Generic;
namespace Volo.Abp.PermissionManagement;
public class ResourcePermissionDefinitionDto
@ -5,4 +7,6 @@ public class ResourcePermissionDefinitionDto
public string Name { get; set; }
public string DisplayName { get; set; }
public List<string> AllowedProviders { get; set; }
}

9
modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo/Abp/PermissionManagement/PermissionAppService.cs

@ -296,6 +296,7 @@ public class PermissionAppService : ApplicationService, IPermissionAppService
{
Name = resourcePermission.Name,
DisplayName = resourcePermission.DisplayName?.Localize(StringLocalizerFactory),
AllowedProviders = resourcePermission.Providers
});
}
@ -361,7 +362,9 @@ public class PermissionAppService : ApplicationService, IPermissionAppService
Permissions = new List<ResourcePermissionWithProdiverGrantInfoDto>()
};
var resourcePermissions = await ResourcePermissionManager.GetAvailablePermissionsAsync(resourceName);
var resourcePermissions = (await ResourcePermissionManager.GetAvailablePermissionsAsync(resourceName))
.Where(x => !x.Providers.Any() || x.Providers.Contains(providerName))
.ToList();
var resourcePermissionGrants = await ResourcePermissionManager.GetAllAsync(resourceName, resourceKey, providerName, providerKey);
var permissionGrants = (await PermissionChecker.IsGrantedAsync(resourcePermissions
.Select(rp => rp.ManagementPermissionName!)
@ -394,7 +397,9 @@ public class PermissionAppService : ApplicationService, IPermissionAppService
public virtual async Task UpdateResourceAsync(string resourceName, string resourceKey, UpdateResourcePermissionsDto input)
{
var resourcePermissions = await ResourcePermissionManager.GetAvailablePermissionsAsync(resourceName);
var resourcePermissions = (await ResourcePermissionManager.GetAvailablePermissionsAsync(resourceName))
.Where(x => !x.Providers.Any() || x.Providers.Contains(input.ProviderName))
.ToList();
var permissionGrants = (await PermissionChecker.IsGrantedAsync(resourcePermissions
.Select(rp => rp.ManagementPermissionName!)
.Distinct().ToArray())).Result.Where(x => x.Value == PermissionGrantResult.Granted).Select(x => x.Key)

21
modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/ResourcePermissionManagementModal.razor.cs

@ -116,18 +116,25 @@ public partial class ResourcePermissionManagementModal
CreateEntity = new CreateModel
{
Permissions = ResourcePermissionDefinitions.Permissions.Select(x => new ResourcePermissionModel
{
Name = x.Name,
DisplayName = x.DisplayName,
IsGranted = false
}).ToList()
Permissions = CreatePermissionModelsForCurrentProvider(Array.Empty<string>())
};
_createDialogVisible = true;
await InvokeAsync(StateHasChanged);
}
protected virtual List<ResourcePermissionModel> CreatePermissionModelsForCurrentProvider(ICollection<string> grantedPermissionNames)
{
return ResourcePermissionDefinitions.Permissions
.Where(x => x.AllowedProviders.IsNullOrEmpty() || x.AllowedProviders.Contains(CurrentLookupService))
.Select(x => new ResourcePermissionModel
{
Name = x.Name,
DisplayName = x.DisplayName,
IsGranted = grantedPermissionNames.Contains(x.Name)
}).ToList();
}
protected virtual async Task SelectedProviderKeyChanged(SearchProviderKeyInfo? value)
{
_selectedProviderKey = value;
@ -209,6 +216,8 @@ public partial class ResourcePermissionManagementModal
protected virtual async Task OnLookupServiceCheckedValueChanged(string? value)
{
CurrentLookupService = value;
CreateEntity.Permissions = CreatePermissionModelsForCurrentProvider(
CreateEntity.Permissions.Where(x => x.IsGranted).Select(x => x.Name).ToList());
_selectedProviderKey = null;
ProviderKeys = new List<SearchProviderKeyInfo>();
if (_createFormRef != null)

21
modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/ResourcePermissionManagementModal.razor.cs

@ -112,18 +112,25 @@ public partial class ResourcePermissionManagementModal
CreateEntity = new CreateModel
{
Permissions = ResourcePermissionDefinitions.Permissions.Select(x => new ResourcePermissionModel
{
Name = x.Name,
DisplayName = x.DisplayName,
IsGranted = false
}).ToList()
Permissions = CreatePermissionModelsForCurrentProvider(Array.Empty<string>())
};
await CreateModal.Show();
await InvokeAsync(StateHasChanged);
}
protected virtual List<ResourcePermissionModel> CreatePermissionModelsForCurrentProvider(ICollection<string> grantedPermissionNames)
{
return ResourcePermissionDefinitions.Permissions
.Where(x => x.AllowedProviders.IsNullOrEmpty() || x.AllowedProviders.Contains(CurrentLookupService))
.Select(x => new ResourcePermissionModel
{
Name = x.Name,
DisplayName = x.DisplayName,
IsGranted = grantedPermissionNames.Contains(x.Name)
}).ToList();
}
protected virtual async Task SelectedProviderKeyAsync(string value)
{
ProviderKey = value;
@ -231,6 +238,8 @@ public partial class ResourcePermissionManagementModal
protected virtual async Task OnLookupServiceCheckedValueChanged(string value)
{
CurrentLookupService = value;
CreateEntity.Permissions = CreatePermissionModelsForCurrentProvider(
CreateEntity.Permissions.Where(x => x.IsGranted).Select(x => x.Name).ToList());
ProviderKey = null;
ProviderDisplayName = null;
await ProviderKeyAutocompleteRef.Clear();

2
modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/AddResourcePermissionManagementModal.cshtml

@ -42,7 +42,7 @@
@foreach (var permission in Model.ResourcePermissionDefinitions.Permissions)
{
<div class="form-check">
<input class="form-check-input" type="checkbox" name="AddModel.Permissions[]" id="@permission.Name.Replace(".", "")" value="@permission.Name">
<input class="form-check-input" type="checkbox" name="AddModel.Permissions[]" id="@permission.Name.Replace(".", "")" value="@permission.Name" data-allowed-providers="@string.Join(",", permission.AllowedProviders ?? new List<string>())">
<label class="form-check-label" for="@permission.Name.Replace(".", "")">@permission.DisplayName</label>
</div>
}

28
modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/add-resource-permission-management-modal.js

@ -1,12 +1,31 @@
var abp = abp || {};
(function ($) {
var $all = $("#grantAllresourcePermissions");
var $items = $("#permissionList input[type='checkbox']").not("#grantAllresourcePermissions");
var $allItems = $("#permissionList input[type='checkbox']").not("#grantAllresourcePermissions");
var $items = $allItems;
function updateGrantAllCheckbox() {
$all.prop("checked", $items.length > 0 && $items.length === $items.filter(":checked").length);
}
function filterPermissionsByProvider() {
var providerName = $('input[name="AddModel.ProviderName"]:checked').val();
$items = $allItems.filter(function () {
var allowedProviders = $(this).attr("data-allowed-providers");
return !allowedProviders || allowedProviders.split(",").indexOf(providerName) >= 0;
});
$allItems.not($items).prop("checked", false).closest(".form-check").addClass("d-none");
$items.closest(".form-check").removeClass("d-none");
updateGrantAllCheckbox();
}
filterPermissionsByProvider();
$all.on("change", function () {
$items.prop("checked", this.checked);
});
$items.on("change", function () {
$all.prop("checked", $items.length === $items.filter(":checked").length);
$allItems.on("change", function () {
updateGrantAllCheckbox();
});
var $permissionManagementForm = $("#addResourcePermissionManagementForm");
@ -47,6 +66,7 @@ var abp = abp || {};
});
$('input[name="AddModel.ProviderName"]').change(function () {
filterPermissionsByProvider();
$providerKey.val(null).trigger('change');
});
@ -80,7 +100,7 @@ var abp = abp || {};
$checkbox.prop('checked', false);
}
});
$all.prop("checked", $items.length === $items.filter(":checked").length);
updateGrantAllCheckbox();
});
});

204
modules/permission-management/test/Volo.Abp.PermissionManagement.Application.Tests/Volo/Abp/PermissionManagement/PermissionAppService_ResourcePermission_Tests.cs

@ -0,0 +1,204 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Shouldly;
using Xunit;
namespace Volo.Abp.PermissionManagement;
public class PermissionAppService_ResourcePermission_Tests : AbpPermissionManagementApplicationTestBase
{
private static readonly string ResourceKey = TestEntityResource.ResourceKey7;
private readonly IPermissionAppService _permissionAppService;
private readonly IResourcePermissionGrantRepository _resourcePermissionGrantRepository;
private readonly FakePermissionChecker _fakePermissionChecker;
public PermissionAppService_ResourcePermission_Tests()
{
_permissionAppService = GetRequiredService<IPermissionAppService>();
_resourcePermissionGrantRepository = GetRequiredService<IResourcePermissionGrantRepository>();
_fakePermissionChecker = GetRequiredService<FakePermissionChecker>();
}
[Fact]
public async Task GetResourceDefinitions_Should_Return_Allowed_Providers()
{
var result = await _permissionAppService.GetResourceDefinitionsAsync(TestEntityResource.ResourceName);
result.Permissions.First(x => x.Name == "MyResourcePermission1").AllowedProviders.ShouldBeEmpty();
result.Permissions.First(x => x.Name == "MyResourcePermission4").AllowedProviders.ShouldBe(new[] { "U" });
result.Permissions.First(x => x.Name == "MyResourcePermission9").AllowedProviders.ShouldBe(new[] { "Test" });
}
[Fact]
public async Task GetResourceDefinitions_Should_Not_Return_Permissions_The_Current_User_Cannot_Manage()
{
_fakePermissionChecker.SetGrantedPermissions();
var result = await _permissionAppService.GetResourceDefinitionsAsync(TestEntityResource.ResourceName);
result.Permissions.ShouldBeEmpty();
}
[Fact]
public async Task GetResourceByProvider_Should_Not_Return_Permissions_Not_Allowed_For_The_Provider()
{
await InsertGrantAsync("MyResourcePermission4", "Test");
var result = await GetResourceByTestProviderAsync();
result.Permissions.ShouldNotContain(x => x.Name == "MyResourcePermission4");
}
[Fact]
public async Task GetResourceByProvider_Should_Return_Permissions_Allowed_For_The_Provider()
{
var result = await GetResourceByTestProviderAsync();
result.Permissions.ShouldContain(x => x.Name == "MyResourcePermission1");
result.Permissions.ShouldContain(x => x.Name == "MyResourcePermission9");
}
[Fact]
public async Task GetResourceByProvider_Should_Return_Grant_State()
{
await InsertGrantAsync("MyResourcePermission1", "Test");
var result = await GetResourceByTestProviderAsync();
result.Permissions.ShouldContain(x => x.Name == "MyResourcePermission1" && x.IsGranted && x.Providers.Contains("Test"));
result.Permissions.ShouldContain(x => x.Name == "MyResourcePermission2" && !x.IsGranted && x.Providers.Count == 0);
}
[Fact]
public async Task UpdateResource_Should_Grant_Permissions_When_Another_Permission_Is_Not_Allowed_For_The_Provider()
{
await UpdateResourceForTestProviderAsync("MyResourcePermission1");
(await FindGrantAsync("MyResourcePermission1", "Test")).ShouldNotBeNull();
(await FindGrantAsync("MyResourcePermission4", "Test")).ShouldBeNull();
}
[Fact]
public async Task UpdateResource_Should_Ignore_Requested_Permissions_Not_Allowed_For_The_Provider()
{
await UpdateResourceForTestProviderAsync("MyResourcePermission1", "MyResourcePermission4");
(await FindGrantAsync("MyResourcePermission1", "Test")).ShouldNotBeNull();
(await FindGrantAsync("MyResourcePermission4", "Test")).ShouldBeNull();
}
[Fact]
public async Task UpdateResource_Should_Grant_Permissions_Restricted_To_The_Provider()
{
await UpdateResourceForTestProviderAsync("MyResourcePermission9");
(await FindGrantAsync("MyResourcePermission9", "Test")).ShouldNotBeNull();
}
[Fact]
public async Task UpdateResource_Should_Revoke_Permissions_Not_In_The_Input()
{
await UpdateResourceForTestProviderAsync("MyResourcePermission1", "MyResourcePermission2");
await UpdateResourceForTestProviderAsync("MyResourcePermission1");
(await FindGrantAsync("MyResourcePermission1", "Test")).ShouldNotBeNull();
(await FindGrantAsync("MyResourcePermission2", "Test")).ShouldBeNull();
}
[Fact]
public async Task UpdateResource_Should_Revoke_All_Permissions_When_Input_Is_Empty()
{
await UpdateResourceForTestProviderAsync("MyResourcePermission1", "MyResourcePermission9");
await UpdateResourceForTestProviderAsync();
(await FindGrantAsync("MyResourcePermission1", "Test")).ShouldBeNull();
(await FindGrantAsync("MyResourcePermission9", "Test")).ShouldBeNull();
}
[Fact]
public async Task UpdateResource_Should_Not_Change_Permissions_The_Current_User_Cannot_Manage()
{
await InsertGrantAsync("MyResourcePermission2", "Test");
_fakePermissionChecker.SetGrantedPermissions();
await UpdateResourceForTestProviderAsync("MyResourcePermission1");
(await FindGrantAsync("MyResourcePermission1", "Test")).ShouldBeNull();
(await FindGrantAsync("MyResourcePermission2", "Test")).ShouldNotBeNull();
}
[Fact]
public async Task UpdateResource_Should_Keep_Existing_Grants_Not_Allowed_For_The_Provider()
{
await InsertGrantAsync("MyResourcePermission4", "Test");
await UpdateResourceForTestProviderAsync();
(await FindGrantAsync("MyResourcePermission4", "Test")).ShouldNotBeNull();
}
[Fact]
public async Task DeleteResource_Should_Delete_All_Grants_Of_The_Provider()
{
await InsertGrantAsync("MyResourcePermission1", "Test");
await InsertGrantAsync("MyResourcePermission4", "Test");
await InsertGrantAsync("MyResourcePermission1", "Test", "AnotherKey");
await _permissionAppService.DeleteResourceAsync(TestEntityResource.ResourceName, ResourceKey, "Test", "Test");
(await FindGrantAsync("MyResourcePermission1", "Test")).ShouldBeNull();
(await FindGrantAsync("MyResourcePermission4", "Test")).ShouldBeNull();
(await FindGrantAsync("MyResourcePermission1", "Test", "AnotherKey")).ShouldNotBeNull();
}
[Fact]
public async Task GetResource_Should_Group_Grants_By_Provider()
{
await InsertGrantAsync("MyResourcePermission1", "Test");
await InsertGrantAsync("MyResourcePermission2", "Test");
var result = await _permissionAppService.GetResourceAsync(TestEntityResource.ResourceName, ResourceKey);
var grant = result.Permissions.ShouldHaveSingleItem();
grant.ProviderName.ShouldBe("Test");
grant.ProviderKey.ShouldBe("Test");
grant.Permissions.Select(x => x.Name).ShouldBe(new[] { "MyResourcePermission1", "MyResourcePermission2" }, ignoreOrder: true);
}
private Task<GetResourcePermissionWithProviderListResultDto> GetResourceByTestProviderAsync()
{
return _permissionAppService.GetResourceByProviderAsync(TestEntityResource.ResourceName, ResourceKey, "Test", "Test");
}
private Task UpdateResourceForTestProviderAsync(params string[] permissions)
{
return _permissionAppService.UpdateResourceAsync(
TestEntityResource.ResourceName,
ResourceKey,
new UpdateResourcePermissionsDto
{
ProviderName = "Test",
ProviderKey = "Test",
Permissions = new List<string>(permissions)
});
}
private Task<ResourcePermissionGrant> InsertGrantAsync(string permissionName, string providerName, string providerKey = "Test")
{
return _resourcePermissionGrantRepository.InsertAsync(new ResourcePermissionGrant(
Guid.NewGuid(),
permissionName,
TestEntityResource.ResourceName,
ResourceKey,
providerName,
providerKey));
}
private Task<ResourcePermissionGrant> FindGrantAsync(string permissionName, string providerName, string providerKey = "Test")
{
return _resourcePermissionGrantRepository.FindAsync(permissionName, TestEntityResource.ResourceName, ResourceKey, providerName, providerKey);
}
}

10
modules/permission-management/test/Volo.Abp.PermissionManagement.Application.Tests/Volo/Abp/PermissionManagement/PermissionAppService_Tests.cs

@ -93,6 +93,16 @@ public class PermissionAppService_Tests : AbpPermissionManagementApplicationTest
testGroup.Permissions.ShouldNotContain(x => x.Name == "MyDisabledPermission2.ChildPermission2.ChildPermission1");
}
[Fact]
public async Task Get_Should_Not_Return_Permissions_Not_Allowed_For_The_Provider()
{
var result = await _permissionAppService.GetAsync("Test", "Test");
var testGroup = result.Groups.First(g => g.Name == "TestGroup");
testGroup.Permissions.ShouldContain(x => x.Name == "MyPermission1");
testGroup.Permissions.ShouldNotContain(x => x.Name == "MyPermission4");
}
[Fact]
public async Task GetByGroupAsync()
{

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

@ -249,6 +249,42 @@ public class ResourcePermissionManager_Tests : PermissionTestBase
exception.Message.ShouldBe("Unknown resource permission management provider: UndefinedProvider");
}
[Fact]
public async Task Set_Should_Throw_Exception_If_Provider_Not_Allowed()
{
var exception = await Assert.ThrowsAsync<ApplicationException>(async () =>
{
await _resourcePermissionManager.SetAsync(
"MyResourcePermission4",
TestEntityResource.ResourceName,
TestEntityResource.ResourceKey7,
"Test",
"Test",
false);
});
exception.Message.ShouldContain("MyResourcePermission4");
}
[Fact]
public async Task Set_Should_Grant_Permission_Restricted_To_The_Provider()
{
await _resourcePermissionManager.SetAsync(
"MyResourcePermission9",
TestEntityResource.ResourceName,
TestEntityResource.ResourceKey7,
"Test",
"Test",
true);
(await _resourcePermissionGrantRepository.FindAsync(
"MyResourcePermission9",
TestEntityResource.ResourceName,
TestEntityResource.ResourceKey7,
"Test",
"Test")).ShouldNotBeNull();
}
[Fact]
public async Task UpdateProviderKey()
{

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

@ -58,7 +58,7 @@ public class ResourcePermissionStore_Tests : PermissionTestBase
TestEntityResource.ResourceName,
TestEntityResource.ResourceKey1);
permissions.Result.Count.ShouldBe(10);
permissions.Result.Count.ShouldBe(11);
permissions.Result.ShouldContain(p => p.Key == "MyResourcePermission1" && p.Value == PermissionGrantResult.Granted);
permissions.Result.ShouldContain(p => p.Key == "MyResourceDisabledPermission1" && p.Value == PermissionGrantResult.Undefined);
permissions.Result.ShouldContain(p => p.Key == "MyResourcePermission2" && p.Value == PermissionGrantResult.Undefined);
@ -69,6 +69,7 @@ public class ResourcePermissionStore_Tests : PermissionTestBase
permissions.Result.ShouldContain(p => p.Key == "MyResourceDisabledPermission2" && p.Value == PermissionGrantResult.Undefined);
permissions.Result.ShouldContain(p => p.Key == "MyResourcePermission7" && p.Value == PermissionGrantResult.Undefined);
permissions.Result.ShouldContain(p => p.Key == "MyResourcePermission8" && p.Value == PermissionGrantResult.Undefined);
permissions.Result.ShouldContain(p => p.Key == "MyResourcePermission9" && p.Value == PermissionGrantResult.Undefined);
permissions = await _resourcePermissionStore.GetPermissionsAsync(
TestEntityResource.ResourceName,

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

@ -24,5 +24,6 @@ public class TestResourcePermissionDefinitionProvider : PermissionDefinitionProv
context.AddResourcePermission("MyResourcePermission7", TestEntityResource.ResourceName, "TestEntityManagementPermission");
context.AddResourcePermission("MyResourcePermission8", TestEntityResource.ResourceName, "TestEntityManagementPermission");
context.AddResourcePermission("MyResourcePermission9", TestEntityResource.ResourceName, "TestEntityManagementPermission").WithProviders("Test");
}
}

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

@ -1,4 +1,5 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Volo.Abp.DependencyInjection;
@ -24,6 +25,6 @@ public class TestResourcePermissionProviderKeyLookupService : IResourcePermissio
public Task<List<ResourcePermissionProviderKeyInfo>> SearchAsync(string[] keys, CancellationToken cancellationToken = default)
{
throw new System.NotImplementedException();
return Task.FromResult(keys.Select(key => new ResourcePermissionProviderKeyInfo(key, key)).ToList());
}
}

13
npm/ng-packs/packages/permission-management/proxy/src/lib/proxy/generate-proxy.json

@ -9613,6 +9613,19 @@
"maximum": null,
"regex": null,
"isNullable": false
},
{
"name": "AllowedProviders",
"jsonName": null,
"type": "[System.String]",
"typeSimple": "[string]",
"isRequired": false,
"minLength": null,
"maxLength": null,
"minimum": null,
"maximum": null,
"regex": null,
"isNullable": false
}
]
},

1
npm/ng-packs/packages/permission-management/proxy/src/lib/proxy/models.ts

@ -50,6 +50,7 @@ export interface ProviderInfoDto {
export interface ResourcePermissionDefinitionDto {
name?: string;
displayName?: string;
allowedProviders?: string[];
}
export interface ResourcePermissionGrantInfoDto {

5
npm/ng-packs/packages/permission-management/src/lib/components/resource-permission-management/resource-permission-form/resource-permission-form.component.html

@ -24,7 +24,10 @@
<abp-provider-key-search [resourceName]="resourceName()" />
</div>
<abp-permission-checkbox-list [permissions]="state.permissionDefinitions()" idPrefix="add" />
<abp-permission-checkbox-list
[permissions]="state.availablePermissionDefinitions()"
idPrefix="add"
/>
} @else {
<div class="mb-3" id="permissionList">
<abp-permission-checkbox-list

13
npm/ng-packs/packages/permission-management/src/lib/services/resource-permission-state.service.ts

@ -48,8 +48,15 @@ export class ResourcePermissionStateService {
readonly isEditMode = computed(() => this.viewMode() === eResourcePermissionViewModes.Edit);
readonly isListMode = computed(() => this.viewMode() === eResourcePermissionViewModes.List);
readonly availablePermissionDefinitions = computed(() => {
const providerName = this.selectedProviderName();
return this.permissionDefinitions().filter(
p => !p.allowedProviders?.length || p.allowedProviders.includes(providerName),
);
});
readonly currentPermissionsList = computed(() =>
this.isAddMode() ? this.permissionDefinitions() : this.permissionsWithProvider()
this.isAddMode() ? this.availablePermissionDefinitions() : this.permissionsWithProvider(),
);
readonly allPermissionsSelected = computed(() => {
@ -116,6 +123,10 @@ export class ResourcePermissionStateService {
// Provider search methods
onProviderChange(providerName: string) {
this.selectedProviderName.set(providerName);
const availableNames = this.availablePermissionDefinitions().map(p => p.name || '');
this.selectedPermissions.set(
this.selectedPermissions().filter(p => availableNames.includes(p)),
);
this.selectedProviderKey.set('');
this.searchResults.set([]);
this.searchFilter.set('');

59
npm/ng-packs/packages/permission-management/src/lib/tests/resource-permission-state.service.spec.ts

@ -0,0 +1,59 @@
import { ResourcePermissionDefinitionDto } from '@abp/ng.permission-management/proxy';
import { ResourcePermissionStateService } from '../services/resource-permission-state.service';
describe('ResourcePermissionStateService', () => {
const definitions: ResourcePermissionDefinitionDto[] = [
{ name: 'Any', displayName: 'Any', allowedProviders: [] },
{ name: 'ClientOnly', displayName: 'Client only', allowedProviders: ['C'] },
{ name: 'UserOrRole', displayName: 'User or role', allowedProviders: ['U', 'R'] },
];
let state: ResourcePermissionStateService;
beforeEach(() => {
state = new ResourcePermissionStateService();
state.setProviders([{ name: 'U' }, { name: 'R' }, { name: 'C' }]);
state.setDefinitions(definitions);
state.goToAddMode();
});
const names = (items: { name?: string }[]) => items.map(x => x.name);
it('should only list the permissions allowed for the selected provider in add mode', () => {
expect(names(state.currentPermissionsList())).toEqual(['Any', 'UserOrRole']);
state.onProviderChange('C');
expect(names(state.currentPermissionsList())).toEqual(['Any', 'ClientOnly']);
});
it('should treat a permission without allowed providers as allowed for every provider', () => {
state.setDefinitions([{ name: 'Legacy', displayName: 'Legacy' }]);
expect(names(state.currentPermissionsList())).toEqual(['Legacy']);
});
it('should only select the permissions allowed for the selected provider when selecting all', () => {
state.toggleAllPermissions(true);
expect(state.selectedPermissions()).toEqual(['Any', 'UserOrRole']);
expect(state.allPermissionsSelected()).toBe(true);
});
it('should drop the selected permissions the new provider is not allowed to hold', () => {
state.toggleAllPermissions(true);
state.onProviderChange('C');
expect(state.selectedPermissions()).toEqual(['Any']);
expect(state.allPermissionsSelected()).toBe(false);
});
it('should not filter the permissions in edit mode', () => {
state.setEditModePermissions([
{ name: 'ClientOnly', displayName: 'Client only', providers: ['C'], isGranted: true },
]);
expect(names(state.currentPermissionsList())).toEqual(['ClientOnly']);
});
});
Loading…
Cancel
Save