Added support for Altinn2-generated tokens

src/Altinn.Broker.API/Program.cs

@@ -105,22 +105,38 @@ static void ConfigureServices(IServiceCollection services, IConfiguration config
 
     services.ConfigureHangfire();
 
-    services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme).AddJwtBearer(options =>
-    {
-        var altinnOptions = new AltinnOptions();
-        config.GetSection(nameof(AltinnOptions)).Bind(altinnOptions);
-        options.SaveToken = true;
-        options.MetadataAddress = altinnOptions.OpenIdWellKnown;
-        options.TokenValidationParameters = new TokenValidationParameters
+    services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
+        .AddJwtBearer(options =>
         {
-            ValidateIssuerSigningKey = true,
-            ValidateIssuer = true,
-            ValidateAudience = false,
-            RequireExpirationTime = true,
-            ValidateLifetime = !hostEnvironment.IsDevelopment(), // Do not validate lifetime in tests
-            ClockSkew = TimeSpan.Zero
-        };
-    });
+            var altinnOptions = new AltinnOptions();
+            config.GetSection(nameof(AltinnOptions)).Bind(altinnOptions);
+            options.SaveToken = true;
+            options.MetadataAddress = altinnOptions.OpenIdWellKnown;
+            options.TokenValidationParameters = new TokenValidationParameters
+            {
+                ValidateIssuerSigningKey = true,
+                ValidateIssuer = true,
+                ValidateAudience = false,
+                RequireExpirationTime = true,
+                ValidateLifetime = !hostEnvironment.IsDevelopment(), // Do not validate lifetime in tests
+                ClockSkew = TimeSpan.Zero
+            };
+        })
+        .AddJwtBearer("Legacy", options => { // To support "overgangslosningen"
+            var altinnOptions = new AltinnOptions();
+            config.GetSection(nameof(AltinnOptions)).Bind(altinnOptions);
+            options.SaveToken = true;
+            options.MetadataAddress = altinnOptions.LegacyOpenIdWellKnown;
+            options.TokenValidationParameters = new TokenValidationParameters
+            {
+                ValidateIssuerSigningKey = true,
+                ValidateIssuer = true,
+                ValidateAudience = false,
+                RequireExpirationTime = true,
+                ValidateLifetime = !hostEnvironment.IsDevelopment(), // Do not validate lifetime in tests
+                ClockSkew = TimeSpan.Zero
+            };
+        });
 
     services.AddTransient<IAuthorizationHandler, ScopeAccessHandler>();
     services.AddAuthorization(options =>

src/Altinn.Broker.API/appsettings.Development.json

@@ -18,6 +18,7 @@
   },
   "AltinnOptions": {
     "OpenIdWellKnown": "https://platform.tt02.altinn.no/authentication/api/v1/openid/.well-known/openid-configuration",
+    "LegacyOpenIdWellKnown": "https://test.maskinporten.no/.well-known/oauth-authorization-server",
     "PlatformGatewayUrl": "https://platform.tt02.altinn.no/",
     "PlatformSubscriptionKey": ""
   }

src/Altinn.Broker.Core/Options/AltinnOptions.cs

@@ -3,6 +3,7 @@
 public class AltinnOptions
 {
     public string OpenIdWellKnown { get; set; }
+    public string LegacyOpenIdWellKnown { get; set; }
     public string PlatformGatewayUrl { get; set; }
     public string PlatformSubscriptionKey { get; set; }
 }