Skip to content

Support get permisons info by group name. #22724

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Support get permisons info by group name. #22724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc9f78e
Support get permisons info by group name.
maliming Apr 21, 2025
889c7c8
Add tests for GetByGroupAsync.
maliming Apr 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ...onManagement.Application.Contracts/Volo/Abp/PermissionManagement/IPermissionAppService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,7 @@ public interface IPermissionAppService : IApplicationService
{
Task<GetPermissionListResultDto> GetAsync([NotNull] string providerName, [NotNull] string providerKey);

Task<GetPermissionListResultDto> GetByGroupAsync([NotNull] string groupName, [NotNull] string providerName, [NotNull] string providerKey);

Task UpdateAsync([NotNull] string providerName, [NotNull] string providerKey, UpdatePermissionsDto input);
}
14 changes: 12 additions & 2 deletions ...bp.PermissionManagement.Application/Volo/Abp/PermissionManagement/PermissionAppService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,16 @@ public PermissionAppService(
}

public virtual async Task<GetPermissionListResultDto> GetAsync(string providerName, string providerKey)
{
return await GetInternalAsync(null, providerName, providerKey);
}

public virtual async Task<GetPermissionListResultDto> GetByGroupAsync(string groupName, string providerName, string providerKey)
{
return await GetInternalAsync(groupName, providerName, providerKey);
}

protected virtual async Task<GetPermissionListResultDto> GetInternalAsync(string groupName, string providerName, string providerKey)
{
await CheckProviderPolicy(providerName);

Expand All @@ -45,7 +55,7 @@ public virtual async Task<GetPermissionListResultDto> GetAsync(string providerNa
var multiTenancySide = CurrentTenant.GetMultiTenancySide();
var permissionGroups = new List<PermissionGroupDto>();

foreach (var group in await PermissionDefinitionManager.GetGroupsAsync())
foreach (var group in (await PermissionDefinitionManager.GetGroupsAsync()).WhereIf(!groupName.IsNullOrWhiteSpace(), x => x.Name == groupName))
{
var groupDto = CreatePermissionGroupDto(group);
var permissions = group.GetPermissionsWithChildren()
Expand Down Expand Up @@ -108,7 +118,7 @@ public virtual async Task<GetPermissionListResultDto> GetAsync(string providerNa
return result;
}

protected virtual PermissionGrantInfoDto CreatePermissionGrantInfoDto(PermissionDefinition permission)
protected virtual PermissionGrantInfoDto CreatePermissionGrantInfoDto(PermissionDefinition permission)
{
return new PermissionGrantInfoDto
{
Expand Down
10 changes: 10 additions & 0 deletions ...pi.Client/ClientProxies/Volo/Abp/PermissionManagement/PermissionsClientProxy.Generated.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,16 @@ public virtual async Task<GetPermissionListResultDto> GetAsync(string providerNa
});
}

public virtual async Task<GetPermissionListResultDto> GetByGroupAsync(string groupName, string providerName, string providerKey)
{
return await RequestAsync<GetPermissionListResultDto>(nameof(GetByGroupAsync), new ClientProxyRequestTypeValue
{
{ typeof(string), groupName },
{ typeof(string), providerName },
{ typeof(string), providerKey }
});
}

public virtual async Task UpdateAsync(string providerName, string providerKey, UpdatePermissionsDto input)
{
await RequestAsync(nameof(UpdateAsync), new ClientProxyRequestTypeValue
Expand Down
254 changes: 182 additions & 72 deletions ...ermissionManagement.HttpApi.Client/ClientProxies/permissionManagement-generate-proxy.json
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions ...o.Abp.PermissionManagement.HttpApi/Volo/Abp/PermissionManagement/PermissionsController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,13 @@ public virtual Task<GetPermissionListResultDto> GetAsync(string providerName, st
return PermissionAppService.GetAsync(providerName, providerKey);
}

[HttpGet]
[Route("by-group")]
public virtual Task<GetPermissionListResultDto> GetByGroupAsync(string groupName, string providerName, string providerKey)
{
return PermissionAppService.GetByGroupAsync(groupName, providerName, providerKey);
}

[HttpPut]
public virtual Task UpdateAsync(string providerName, string providerKey, UpdatePermissionsDto input)
{
Expand Down
7 changes: 7 additions & 0 deletions ...rc/Volo.Abp.PermissionManagement.Web/wwwroot/client-proxies/permissionManagement-proxy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@
}, ajaxParams));
};

volo.abp.permissionManagement.permissions.getByGroup = function(groupName, providerName, providerKey, ajaxParams) {
return abp.ajax($.extend(true, {
url: abp.appPath + 'api/permission-management/permissions/by-group' + abp.utils.buildQueryString([{ name: 'groupName', value: groupName }, { name: 'providerName', value: providerName }, { name: 'providerKey', value: providerKey }]) + '',
type: 'GET'
}, ajaxParams));
};

volo.abp.permissionManagement.permissions.update = function(providerName, providerKey, input, ajaxParams) {
return abp.ajax($.extend(true, {
url: abp.appPath + 'api/permission-management/permissions' + abp.utils.buildQueryString([{ name: 'providerName', value: providerName }, { name: 'providerKey', value: providerKey }]) + '',
Expand Down
21 changes: 18 additions & 3 deletions ...nManagement.Application.Tests/Volo/Abp/PermissionManagement/PermissionAppService_Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public async Task GetAsync()

permissionListResultDto.ShouldNotBeNull();
permissionListResultDto.EntityDisplayName.ShouldBe(PermissionTestDataBuilder.User1Id.ToString());
permissionListResultDto.Groups.Count.ShouldBe(1);
permissionListResultDto.Groups.Count.ShouldBe(2);
permissionListResultDto.Groups.ShouldContain(x => x.Name == "TestGroup");

permissionListResultDto.Groups.First().Permissions.ShouldContain(x => x.Name == "MyPermission1");
Expand All @@ -50,18 +50,33 @@ public async Task GetAsync()
result.Groups.First().Permissions.ShouldContain(x => x.Name == "MyPermission5");
result.Groups.First().Permissions.ShouldContain(x => x.Name == "MyPermission5.ChildPermission1");
}

permissionListResultDto.Groups.First().Permissions.ShouldContain(x => x.Name == "MyPermission6");
permissionListResultDto.Groups.First().Permissions.ShouldNotContain(x => x.Name == "MyPermission6.ChildDisabledPermission1");
permissionListResultDto.Groups.First().Permissions.ShouldContain(x => x.Name == "MyPermission6.ChildPermission2");

permissionListResultDto.Groups.First().Permissions.ShouldNotContain(x => x.Name == "MyDisabledPermission1");
permissionListResultDto.Groups.First().Permissions.ShouldNotContain(x => x.Name == "MyDisabledPermission2");
permissionListResultDto.Groups.First().Permissions.ShouldNotContain(x => x.Name == "MyDisabledPermission2.ChildPermission1");
permissionListResultDto.Groups.First().Permissions.ShouldNotContain(x => x.Name == "MyDisabledPermission2.ChildPermission2");
permissionListResultDto.Groups.First().Permissions.ShouldNotContain(x => x.Name == "MyDisabledPermission2.ChildPermission2.ChildPermission1");
}

[Fact]
public async Task GetByGroupAsync()
{
var permissionListResultDto = await _permissionAppService.GetByGroupAsync("TestGroup2", UserPermissionValueProvider.ProviderName,
PermissionTestDataBuilder.User1Id.ToString());

permissionListResultDto.ShouldNotBeNull();
permissionListResultDto.EntityDisplayName.ShouldBe(PermissionTestDataBuilder.User1Id.ToString());
permissionListResultDto.Groups.Count.ShouldBe(1);
permissionListResultDto.Groups.ShouldContain(x => x.Name == "TestGroup2");

permissionListResultDto.Groups.First().Permissions.ShouldContain(x => x.Name == "MyPermission7");
permissionListResultDto.Groups.First().Permissions.ShouldContain(x => x.Name == "MyPermission8");
}

[Fact]
public async Task UpdateAsync()
{
Expand Down
8 changes: 6 additions & 2 deletions ...sionManagement.TestBase/Volo/Abp/PermissionManagement/TestPermissionDefinitionProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,18 @@ public override void Define(IPermissionDefinitionContext context)
var myPermission5 = testGroup.AddPermission("MyPermission5");
myPermission5.StateCheckers.Add(new TestRequireRolePermissionStateProvider("super-admin"));
myPermission5.AddChild("MyPermission5.ChildPermission1");

var myPermission6 = testGroup.AddPermission("MyPermission6");
myPermission6.AddChild("MyPermission6.ChildDisabledPermission1", isEnabled: false);
myPermission6.AddChild("MyPermission6.ChildPermission2");

var myDisabledPermission2 = testGroup.AddPermission("MyDisabledPermission2", isEnabled: false);
myDisabledPermission2.AddChild("MyDisabledPermission2.ChildPermission1");
var myDisabledPermission2Child2 = myDisabledPermission2.AddChild("MyDisabledPermission2.ChildPermission2");
myDisabledPermission2Child2.AddChild("MyDisabledPermission2.ChildPermission2.ChildPermission1");

var testGroup2 = context.AddGroup("TestGroup2");
testGroup2.AddPermission("MyPermission7");
testGroup2.AddPermission("MyPermission8");
}
}
Loading