From bdd7607975f4f3948e548e4be5cad08bc8af240a Mon Sep 17 00:00:00 2001 From: maliming Date: Tue, 30 Dec 2025 20:22:30 +0800 Subject: [PATCH] Fix parameter order and minor code cleanups --- .../Resources/ClientResourcePermissionValueProvider.cs | 2 +- .../Volo/Abp/IdentityServer/Clients/ClientFinder.cs | 2 +- .../Volo/Abp/OpenIddict/Applications/AbpApplicationFinder.cs | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/Resources/ClientResourcePermissionValueProvider.cs b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/Resources/ClientResourcePermissionValueProvider.cs index 5eddb82f73..2a73292528 100644 --- a/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/Resources/ClientResourcePermissionValueProvider.cs +++ b/framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/Permissions/Resources/ClientResourcePermissionValueProvider.cs @@ -30,7 +30,7 @@ public class ClientResourcePermissionValueProvider : ResourcePermissionValueProv using (CurrentTenant.Change(null)) { - return await ResourcePermissionStore.IsGrantedAsync(context.ResourceName, context.ResourceKey, context.Permission.Name, Name, clientId) + return await ResourcePermissionStore.IsGrantedAsync(context.Permission.Name, context.ResourceName, context.ResourceKey, Name, clientId) ? PermissionGrantResult.Granted : PermissionGrantResult.Undefined; } diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientFinder.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientFinder.cs index 91fd6f4f4f..52d389af5f 100644 --- a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientFinder.cs +++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientFinder.cs @@ -7,7 +7,7 @@ using Volo.Abp.Domain.Repositories; namespace Volo.Abp.IdentityServer.Clients; -public class ClientFinder: IClientFinder, ITransientDependency +public class ClientFinder : IClientFinder, ITransientDependency { protected IClientRepository ClientRepository { get; } diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/AbpApplicationFinder.cs b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/AbpApplicationFinder.cs index f62db98ded..7c1ec443d0 100644 --- a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/AbpApplicationFinder.cs +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/AbpApplicationFinder.cs @@ -4,7 +4,6 @@ using System.Linq; using System.Threading.Tasks; using Volo.Abp.DependencyInjection; using Volo.Abp.Domain.Repositories; -using Volo.Abp.Identity; namespace Volo.Abp.OpenIddict.Applications;