WIP

NikiforovAll · Apr 23, 2024 · 1a8463c · 1a8463c
1 parent e8223bf
commit 1a8463c
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 21 deletions.
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -14,8 +14,9 @@
     <PackageVersion Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0"/>
     <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0"/>
   </ItemGroup>
+
   <ItemGroup Label="Release">
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0"/>
     <PackageVersion Include="MinVer" Version="5.0.0"/>
   </ItemGroup>
-</Project>
+</Project>
diff --git a/src/Keycloak.AuthServices.Authentication/Claims/KeycloakRolesClaimsTransformation.cs b/src/Keycloak.AuthServices.Authentication/Claims/KeycloakRolesClaimsTransformation.cs
@@ -86,9 +86,9 @@ public Task<ClaimsPrincipal> TransformAsync(ClaimsPrincipal principal)
             {
                 var value = role.GetString();
 
-                var matchingClaim = identity.Claims.FirstOrDefault(claim =>
-                    claim.Type.Equals(this.roleClaimType, StringComparison.OrdinalIgnoreCase) &&
-                    claim.Value.Equals(value, StringComparison.OrdinalIgnoreCase));
+                var matchingClaim = identity.Claims.FirstOrDefault(claim => 
+                    claim.Type.Equals(this.roleClaimType, StringComparison.InvariantCultureIgnoreCase) && 
+                    claim.Value.Equals(value, StringComparison.InvariantCultureIgnoreCase)); 
 
                 if (matchingClaim is null && !string.IsNullOrWhiteSpace(value))
                 {
@@ -119,9 +119,9 @@ public Task<ClaimsPrincipal> TransformAsync(ClaimsPrincipal principal)
                 {
                     var value = role.GetString();
 
-                    var matchingClaim = identity.Claims.FirstOrDefault(claim =>
-                        claim.Type.Equals(this.roleClaimType, StringComparison.OrdinalIgnoreCase) &&
-                        claim.Value.Equals(value, StringComparison.OrdinalIgnoreCase));
+                    var matchingClaim = identity.Claims.FirstOrDefault(claim => 
+                        claim.Type.Equals(this.roleClaimType, StringComparison.InvariantCultureIgnoreCase) && 
+                        claim.Value.Equals(value, StringComparison.InvariantCultureIgnoreCase));
 
                     if (matchingClaim is null && !string.IsNullOrWhiteSpace(value))
                     {

diff --git a/src/Keycloak.AuthServices.Authorization/ProtectedResourcePolicyProvider.cs b/src/Keycloak.AuthServices.Authorization/ProtectedResourcePolicyProvider.cs
@@ -1,4 +1,4 @@
-namespace Keycloak.AuthServices.Authorization;
+namespace Keycloak.AuthServices.Authorization;
 
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.Extensions.Options;
@@ -31,7 +31,7 @@ public ProtectedResourcePolicyProvider(
         var builder = new AuthorizationPolicyBuilder();
         var tokens = policyName.Split('#');
 
-        if (tokens is not { Length: 2 })
+        if (tokens is not {Length: 2})
         {
             return default;
         }

diff --git a/src/Keycloak.AuthServices.Authorization/Requirements/RealmAccessRequirement.cs b/src/Keycloak.AuthServices.Authorization/Requirements/RealmAccessRequirement.cs
@@ -34,7 +34,10 @@ public partial class RealmAccessRequirementHandler : AuthorizationHandler<RealmA
     /// <summary>
     /// </summary>
     /// <param name="logger"></param>
-    public RealmAccessRequirementHandler(ILogger<RealmAccessRequirementHandler> logger) => this.logger = logger;
+    public RealmAccessRequirementHandler(ILogger<RealmAccessRequirementHandler> logger)
+    {
+        this.logger = logger;
+    }
 
     [LoggerMessage(100, LogLevel.Debug,
         "[{Requirement}] Access outcome {Outcome} for user {UserName}")]

diff --git a/src/Keycloak.AuthServices.Common/Keycloak.AuthServices.Common.csproj b/src/Keycloak.AuthServices.Common/Keycloak.AuthServices.Common.csproj
@@ -9,9 +9,6 @@
     <Description>Utils for Keycloak.AuthServices</Description>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" />
-  </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions"/>

diff --git a/src/Keycloak.AuthServices.Sdk/Admin/IKeycloakUserClient.cs b/src/Keycloak.AuthServices.Sdk/Admin/IKeycloakUserClient.cs
@@ -1,4 +1,4 @@
-namespace Keycloak.AuthServices.Sdk.Admin;
+namespace Keycloak.AuthServices.Sdk.Admin;
 
 using Constants;
 using Models;

diff --git a/src/Keycloak.AuthServices.Sdk/Admin/KeycloakAdminClientOptions.cs b/src/Keycloak.AuthServices.Sdk/Admin/KeycloakAdminClientOptions.cs
@@ -1,11 +1,11 @@
-namespace Keycloak.AuthServices.Sdk.Admin;
+namespace Keycloak.AuthServices.Sdk.Admin;
 
 using Common;
 
 /// <summary>
 /// Defines a set of options used to perform Admin HTTP Client calls
 /// </summary>
-public sealed class KeycloakAdminClientOptions : KeycloakInstallationOptions
+public sealed class KeycloakAdminClientOptions: KeycloakInstallationOptions
 {
     /// <summary>
     /// Default section name

diff --git a/src/Keycloak.AuthServices.Sdk/HttpMiddleware/AccessTokenPropagationHandler.cs b/src/Keycloak.AuthServices.Sdk/HttpMiddleware/AccessTokenPropagationHandler.cs
@@ -1,4 +1,4 @@
-namespace Keycloak.AuthServices.Sdk.HttpMiddleware;
+namespace Keycloak.AuthServices.Sdk.HttpMiddleware;
 
 using IdentityModel.Client;
 using Microsoft.AspNetCore.Authentication;

diff --git a/src/Keycloak.AuthServices.Sdk/Keycloak.AuthServices.Sdk.csproj b/src/Keycloak.AuthServices.Sdk/Keycloak.AuthServices.Sdk.csproj
@@ -14,13 +14,10 @@
     <ProjectReference Include="..\Keycloak.AuthServices.Common\Keycloak.AuthServices.Common.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="IdentityModel.AspNetCore" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
     <PackageReference Include="Refit" />
     <PackageReference Include="Refit.HttpClientFactory" />