Browse Source
Refactor permission value provider methods for consistency and clarity
pull/24515/head
maliming
1 month ago
No known key found for this signature in database
GPG Key ID: A646B9CB645ECEA4
7 changed files with
13 additions and
13 deletions
-
framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/ClientPermissionValueProvider.cs
-
framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/Resources/ClientResourcePermissionValueProvider.cs
-
modules/identityserver/src/Volo.Abp.PermissionManagement.Domain.IdentityServer/Volo/Abp/PermissionManagement/IdentityServer/ClientResourcePermissionManagementProvider.cs
-
modules/identityserver/src/Volo.Abp.PermissionManagement.Domain.IdentityServer/Volo/Abp/PermissionManagement/IdentityServer/ClientResourcePermissionProviderKeyLookupService.cs
-
modules/openiddict/src/Volo.Abp.PermissionManagement.Domain.OpenIddict/Volo/Abp/PermissionManagement/OpenIddict/ApplicationResourcePermissionManagementProvider.cs
-
modules/openiddict/src/Volo.Abp.PermissionManagement.Domain.OpenIddict/Volo/Abp/PermissionManagement/OpenIddict/ApplicationResourcePermissionProviderKeyLookupService.cs
-
modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/ResourcePermissionManagementProvider.cs
|
|
|
@ -44,7 +44,7 @@ public class ClientPermissionValueProvider : PermissionValueProvider |
|
|
|
var clientId = context.Principal?.FindFirst(AbpClaimTypes.ClientId)?.Value; |
|
|
|
if (clientId == null) |
|
|
|
{ |
|
|
|
return new MultiplePermissionGrantResult(permissionNames); ; |
|
|
|
return new MultiplePermissionGrantResult(permissionNames); |
|
|
|
} |
|
|
|
|
|
|
|
using (CurrentTenant.Change(null)) |
|
|
|
|
|
|
|
@ -44,7 +44,7 @@ public class ClientResourcePermissionValueProvider : ResourcePermissionValueProv |
|
|
|
var clientId = context.Principal?.FindFirst(AbpClaimTypes.ClientId)?.Value; |
|
|
|
if (clientId == null) |
|
|
|
{ |
|
|
|
return new MultiplePermissionGrantResult(permissionNames); ; |
|
|
|
return new MultiplePermissionGrantResult(permissionNames); |
|
|
|
} |
|
|
|
|
|
|
|
using (CurrentTenant.Change(null)) |
|
|
|
|
|
|
|
@ -20,7 +20,7 @@ public class ClientResourcePermissionManagementProvider : ResourcePermissionMana |
|
|
|
{ |
|
|
|
} |
|
|
|
|
|
|
|
public override Task<ResourcePermissionValueProviderGrantInfo> CheckAsync(string name, string resourceName,string resourceKey, string providerName, string providerKey) |
|
|
|
public override Task<ResourcePermissionValueProviderGrantInfo> CheckAsync(string name, string resourceName, string resourceKey, string providerName, string providerKey) |
|
|
|
{ |
|
|
|
using (CurrentTenant.Change(null)) |
|
|
|
{ |
|
|
|
|
|
|
|
@ -27,8 +27,8 @@ public class ClientResourcePermissionProviderKeyLookupService : IResourcePermiss |
|
|
|
|
|
|
|
public virtual async Task<List<ResourcePermissionProviderKeyInfo>> SearchAsync(string filter = null, int page = 1, CancellationToken cancellationToken = default) |
|
|
|
{ |
|
|
|
var users = await ClientFinder.SearchAsync(filter, page); |
|
|
|
return users.Select(u => new ResourcePermissionProviderKeyInfo(u.Id.ToString(), u.ClientId)).ToList(); |
|
|
|
var clients = await ClientFinder.SearchAsync(filter, page); |
|
|
|
return clients.Select(x => new ResourcePermissionProviderKeyInfo(x.Id.ToString(), x.ClientId)).ToList(); |
|
|
|
} |
|
|
|
|
|
|
|
public virtual async Task<List<ResourcePermissionProviderKeyInfo>> SearchAsync(string[] keys, CancellationToken cancellationToken = default) |
|
|
|
@ -39,7 +39,7 @@ public class ClientResourcePermissionProviderKeyLookupService : IResourcePermiss |
|
|
|
.Select(id => id.Value) |
|
|
|
.Distinct() |
|
|
|
.ToArray(); |
|
|
|
var users = await ClientFinder.SearchByIdsAsync(ids.ToArray()); |
|
|
|
return users.Select(u => new ResourcePermissionProviderKeyInfo(u.Id.ToString(), u.ClientId)).ToList(); |
|
|
|
var clients = await ClientFinder.SearchByIdsAsync(ids.ToArray()); |
|
|
|
return clients.Select(x => new ResourcePermissionProviderKeyInfo(x.Id.ToString(), x.ClientId)).ToList(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ -17,7 +17,7 @@ public class ApplicationResourcePermissionManagementProvider : ResourcePermissio |
|
|
|
{ |
|
|
|
} |
|
|
|
|
|
|
|
public override Task<ResourcePermissionValueProviderGrantInfo> CheckAsync(string name, string resourceName,string resourceKey, string providerName, string providerKey) |
|
|
|
public override Task<ResourcePermissionValueProviderGrantInfo> CheckAsync(string name, string resourceName, string resourceKey, string providerName, string providerKey) |
|
|
|
{ |
|
|
|
using (CurrentTenant.Change(null)) |
|
|
|
{ |
|
|
|
|
|
|
|
@ -28,8 +28,8 @@ public class ApplicationResourcePermissionProviderKeyLookupService : IResourcePe |
|
|
|
|
|
|
|
public virtual async Task<List<ResourcePermissionProviderKeyInfo>> SearchAsync(string filter = null, int page = 1, CancellationToken cancellationToken = default) |
|
|
|
{ |
|
|
|
var users = await ApplicationFinder.SearchAsync(filter, page); |
|
|
|
return users.Select(u => new ResourcePermissionProviderKeyInfo(u.Id.ToString(), u.ClientId)).ToList(); |
|
|
|
var applications = await ApplicationFinder.SearchAsync(filter, page); |
|
|
|
return applications.Select(x => new ResourcePermissionProviderKeyInfo(x.Id.ToString(), x.ClientId)).ToList(); |
|
|
|
} |
|
|
|
|
|
|
|
public virtual async Task<List<ResourcePermissionProviderKeyInfo>> SearchAsync(string[] keys, CancellationToken cancellationToken = default) |
|
|
|
@ -40,7 +40,7 @@ public class ApplicationResourcePermissionProviderKeyLookupService : IResourcePe |
|
|
|
.Select(id => id.Value) |
|
|
|
.Distinct() |
|
|
|
.ToArray(); |
|
|
|
var users = await ApplicationFinder.SearchByIdsAsync(ids.ToArray()); |
|
|
|
return users.Select(u => new ResourcePermissionProviderKeyInfo(u.Id.ToString(), u.ClientId)).ToList(); |
|
|
|
var applications = await ApplicationFinder.SearchByIdsAsync(ids.ToArray()); |
|
|
|
return applications.Select(x => new ResourcePermissionProviderKeyInfo(x.Id.ToString(), x.ClientId)).ToList(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ -26,7 +26,7 @@ public abstract class ResourcePermissionManagementProvider : IResourcePermission |
|
|
|
CurrentTenant = currentTenant; |
|
|
|
} |
|
|
|
|
|
|
|
public virtual async Task<ResourcePermissionValueProviderGrantInfo> CheckAsync(string name, string resourceName,string resourceKey, string providerName, string providerKey) |
|
|
|
public virtual async Task<ResourcePermissionValueProviderGrantInfo> CheckAsync(string name, string resourceName, string resourceKey, string providerName, string providerKey) |
|
|
|
{ |
|
|
|
var multiplePermissionValueProviderGrantInfo = await CheckAsync(new[] { name }, resourceName, resourceKey, providerName, providerKey); |
|
|
|
|
|
|
|
|