Browse Source
Add providers to resource permission DTO and update usage
pull/24184/head
maliming
2 months ago
No known key found for this signature in database
GPG Key ID: A646B9CB645ECEA4
4 changed files with
7 additions and
2 deletions
-
modules/permission-management/src/Volo.Abp.PermissionManagement.Application.Contracts/Volo/Abp/PermissionManagement/ResourcePermissionWithProdiverGrantInfoDto.cs
-
modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo/Abp/PermissionManagement/PermissionAppService.cs
-
modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/ResourcePermissionManager.cs
-
modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/add-resource-permission-management-modal.js
|
|
|
@ -1,3 +1,5 @@ |
|
|
|
using System.Collections.Generic; |
|
|
|
|
|
|
|
namespace Volo.Abp.PermissionManagement; |
|
|
|
|
|
|
|
public class ResourcePermissionWithProdiverGrantInfoDto |
|
|
|
@ -6,5 +8,7 @@ public class ResourcePermissionWithProdiverGrantInfoDto |
|
|
|
|
|
|
|
public string DisplayName { get; set; } |
|
|
|
|
|
|
|
public List<string> Providers { get; set; } |
|
|
|
|
|
|
|
public bool IsGranted { get; set; } |
|
|
|
} |
|
|
|
|
|
|
|
@ -321,6 +321,7 @@ public class PermissionAppService : ApplicationService, IPermissionAppService |
|
|
|
{ |
|
|
|
Name = resourcePermissionGrant.Name, |
|
|
|
DisplayName = resourcePermission?.DisplayName.Localize(StringLocalizerFactory), |
|
|
|
Providers = resourcePermissionGrant.Providers.Select(x => x.Name).ToList(), |
|
|
|
IsGranted = resourcePermissionGrant.IsGranted |
|
|
|
}); |
|
|
|
} |
|
|
|
|
|
|
|
@ -376,7 +376,7 @@ public class ResourcePermissionManager : IResourcePermissionManager, ISingletonD |
|
|
|
return multiplePermissionWithGrantedProviders; |
|
|
|
} |
|
|
|
|
|
|
|
foreach (var provider in ManagementProviders.Where(x => x.Name == providerName)) |
|
|
|
foreach (var provider in ManagementProviders) |
|
|
|
{ |
|
|
|
permissionNames = resourcePermissions.Select(x => x.Name).ToArray(); |
|
|
|
var multiplePermissionValueProviderGrantInfo = await provider.CheckAsync(permissionNames, resourceName, resourceKey, providerName, providerKey); |
|
|
|
|
|
|
|
@ -68,7 +68,7 @@ var abp = abp || {}; |
|
|
|
volo.abp.permissionManagement.permissions.getResourceByProvider(resourceName, resourceKey, providerName, providerKey).then(function (result) { |
|
|
|
abp.ui.clearBusy(); |
|
|
|
var grantedPermissionNames = result.permissions.filter(function (p) { |
|
|
|
return p.isGranted === true; |
|
|
|
return p.isGranted === true && p.providers.indexOf(providerName) >= 0; |
|
|
|
}).map(function (p) { |
|
|
|
return p.name; |
|
|
|
}); |
|
|
|
|