diff --git a/src/Api/AdminConsole/Authorization/OrganizationClaimsExtensions.cs b/src/Api/AdminConsole/Authorization/OrganizationClaimsExtensions.cs
index c669615b34..e21d153bab 100644
--- a/src/Api/AdminConsole/Authorization/OrganizationClaimsExtensions.cs
+++ b/src/Api/AdminConsole/Authorization/OrganizationClaimsExtensions.cs
@@ -10,11 +10,6 @@ namespace Bit.Api.AdminConsole.Authorization;
public static class OrganizationClaimsExtensions
{
- ///
- /// A delegate that returns true if the user has the specified claim type for an organization, false otherwise.
- ///
- private delegate bool HasClaim(string claimType);
-
///
/// Parses a user's claims and returns an object representing their claims for the specified organization.
///
@@ -47,9 +42,10 @@ public static class OrganizationClaimsExtensions
}
///
- /// Creates a delegate specific to the user and organization.
+ /// Returns a function for evaluating claims for the specified user and organizationId.
+ /// The function returns true if the claim type exists and false otherwise.
///
- private static HasClaim GetClaimsParser(ClaimsPrincipal user, Guid organizationId)
+ private static Func GetClaimsParser(ClaimsPrincipal user, Guid organizationId)
{
// Group claims by ClaimType
var claimsDict = user.Claims
@@ -79,7 +75,7 @@ public static class OrganizationClaimsExtensions
}
}
- private static OrganizationUserType? GetRoleFromClaims(HasClaim hasClaim)
+ private static OrganizationUserType? GetRoleFromClaims(Func hasClaim)
{
if (hasClaim(Claims.OrganizationOwner))
{
@@ -104,7 +100,7 @@ public static class OrganizationClaimsExtensions
return null;
}
- private static Permissions GetPermissionsFromClaims(HasClaim hasClaim)
+ private static Permissions GetPermissionsFromClaims(Func hasClaim)
=> new()
{
AccessEventLogs = hasClaim(Claims.CustomPermissions.AccessEventLogs),