Merge branch 'main' into chore/sql-script-generator-for-yt01

Altinn · Jan 9, 2025 · 08337d2 · 08337d2
2 parents 59f8bf5 + 37e545a
commit 08337d2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/...gdir.Domain.Dialogporten.GraphQL/Common/Authentication/AuthenticationBuilderExtensions.cs b/...gdir.Domain.Dialogporten.GraphQL/Common/Authentication/AuthenticationBuilderExtensions.cs
@@ -1,6 +1,7 @@
 using Microsoft.IdentityModel.Tokens;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using System.Diagnostics;
+using System.IdentityModel.Tokens.Jwt;
 
 namespace Digdir.Domain.Dialogporten.GraphQL.Common.Authentication;
 
@@ -22,6 +23,10 @@ public static IServiceCollection AddDialogportenAuthentication(
 
         services.AddSingleton<ITokenIssuerCache, TokenIssuerCache>();
 
+        // Turn off mapping InboundClaims names to its longer version
+        // "acr" => "http://schemas.microsoft.com/claims/authnclassreference"
+        JwtSecurityTokenHandler.DefaultMapInboundClaims = false;
+
         var authenticationBuilder = services.AddAuthentication();
 
         foreach (var schema in jwtTokenSchemas)

diff --git a/...igdir.Domain.Dialogporten.WebApi/Common/Authentication/AuthenticationBuilderExtensions.cs b/...igdir.Domain.Dialogporten.WebApi/Common/Authentication/AuthenticationBuilderExtensions.cs
@@ -1,6 +1,7 @@
 using Microsoft.IdentityModel.Tokens;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using System.Diagnostics;
+using System.IdentityModel.Tokens.Jwt;
 
 namespace Digdir.Domain.Dialogporten.WebApi.Common.Authentication;
 
@@ -24,6 +25,10 @@ public static IServiceCollection AddDialogportenAuthentication(
 
         services.AddSingleton<ITokenIssuerCache, TokenIssuerCache>();
 
+        // Turn off mapping InboundClaims names to its longer version
+        // "acr" => "http://schemas.microsoft.com/claims/authnclassreference"
+        JwtSecurityTokenHandler.DefaultMapInboundClaims = false;
+
         var authenticationBuilder = services.AddAuthentication();
 
         foreach (var schema in jwtTokenSchemas)