Browse Source

Refactor permission app service for clarity

pull/24374/head
maliming 10 months ago
parent
commit
64c09acc3f
No known key found for this signature in database GPG Key ID: A646B9CB645ECEA4
  1. 12
      modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo/Abp/PermissionManagement/PermissionAppService.cs

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

@ -189,10 +189,10 @@ public class PermissionAppService : ApplicationService, IPermissionAppService
public virtual async Task<SearchProviderKeyListResultDto> SearchResourceProviderKeyAsync(string resourceName, string serviceName, string filter, int page) public virtual async Task<SearchProviderKeyListResultDto> SearchResourceProviderKeyAsync(string resourceName, string serviceName, string filter, int page)
{ {
var resourcePermissions = await ResourcePermissionManager.GetAvailablePermissionsAsync(resourceName); var resourcePermissions = await ResourcePermissionManager.GetAvailablePermissionsAsync(resourceName);
if (!resourcePermissions.Any() || if (resourcePermissions.IsNullOrEmpty() ||
!await AuthorizationService.IsGrantedAnyAsync(resourcePermissions.Select(p => p.ManagementPermissionName!).ToArray())) !await AuthorizationService.IsGrantedAnyAsync(resourcePermissions.Select(p => p.ManagementPermissionName!).ToArray()))
{ {
return new SearchProviderKeyListResultDto();; return new SearchProviderKeyListResultDto();
} }
var lookupService = await ResourcePermissionManager.GetProviderKeyLookupServiceAsync(serviceName); var lookupService = await ResourcePermissionManager.GetProviderKeyLookupServiceAsync(serviceName);
@ -219,7 +219,7 @@ public class PermissionAppService : ApplicationService, IPermissionAppService
{ {
if (await AuthorizationService.IsGrantedAsync(resourcePermission.ManagementPermissionName!)) if (await AuthorizationService.IsGrantedAsync(resourcePermission.ManagementPermissionName!))
{ {
result.Permissions.Add(new ResourcePermissionDefinitionDto() result.Permissions.Add(new ResourcePermissionDefinitionDto
{ {
Name = resourcePermission.Name, Name = resourcePermission.Name,
DisplayName = resourcePermission.DisplayName?.Localize(StringLocalizerFactory), DisplayName = resourcePermission.DisplayName?.Localize(StringLocalizerFactory),
@ -238,10 +238,10 @@ public class PermissionAppService : ApplicationService, IPermissionAppService
}; };
var resourcePermissions = await ResourcePermissionManager.GetAvailablePermissionsAsync(resourceName); var resourcePermissions = await ResourcePermissionManager.GetAvailablePermissionsAsync(resourceName);
var resourcePermissionGrantsGroup = await ResourcePermissionManager.GetAllGroupAsync(resourceName, resourceKey); var resourcePermissionGrants = await ResourcePermissionManager.GetAllGroupAsync(resourceName, resourceKey);
foreach (var resourcePermissionGrant in resourcePermissionGrantsGroup) foreach (var resourcePermissionGrant in resourcePermissionGrants)
{ {
var resourcePermissionGrantInfoDto = new ResourcePermissionGrantInfoDto() var resourcePermissionGrantInfoDto = new ResourcePermissionGrantInfoDto
{ {
ProviderName = resourcePermissionGrant.ProviderName, ProviderName = resourcePermissionGrant.ProviderName,
ProviderKey = resourcePermissionGrant.ProviderKey, ProviderKey = resourcePermissionGrant.ProviderKey,

Loading…
Cancel
Save