RC update -OpenAPI Changes

Author: binon

OpenAPI/LearningHub.Nhs.OpenApi/Auth/AuthStartup.cs

@@ -21,7 +21,7 @@ public static void AddApiKeyAuth(this IServiceCollection services)
         {
             services.AddScoped<IApiKeyRepository, ApiKeyRepository>();
 
-            services.AddAuthentication(ApiKeyDefaults.AuthenticationScheme)
+            services.AddAuthentication()
                 .AddApiKeyInHeaderOrQueryParams<ApiKeyProvider>(
                     options =>
                     {

OpenAPI/LearningHub.Nhs.OpenApi/Startup.cs

@@ -10,12 +10,14 @@ namespace LearningHub.NHS.OpenAPI
 {
     using System.Collections.Generic;
     using System.IO;
+    using AspNetCore.Authentication.ApiKey;
     using LearningHub.NHS.OpenAPI.Auth;
     using LearningHub.NHS.OpenAPI.Configuration;
     using LearningHub.NHS.OpenAPI.Middleware;
     using LearningHub.Nhs.OpenApi.Repositories;
     using LearningHub.Nhs.OpenApi.Repositories.EntityFramework;
     using LearningHub.Nhs.OpenApi.Services;
+    using Microsoft.AspNetCore.Authentication;
     using Microsoft.AspNetCore.Authentication.JwtBearer;
     using Microsoft.AspNetCore.Builder;
     using Microsoft.AspNetCore.Hosting;
@@ -57,17 +59,17 @@ public void ConfigureServices(IServiceCollection services)
 
             services.AddApiKeyAuth();
 
-            services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
+            services.AddAuthentication()
             .AddJwtBearer(options =>
             {
-              options.Authority = this.Configuration.GetValue<string>("LearningHUbAuthServiceConfig:Authority");
-              options.TokenValidationParameters = new TokenValidationParameters()
-              {
-                NameClaimType = "given_name",
-                RoleClaimType = "role",
-                ValidateAudience = true,
-                ValidAudiences = new List<string> { "learninghubopenapi", "learninghubapi" },
-              };
+                options.Authority = this.Configuration.GetValue<string>("LearningHUbAuthServiceConfig:Authority");
+                options.TokenValidationParameters = new TokenValidationParameters()
+                {
+                    NameClaimType = "given_name",
+                    RoleClaimType = "role",
+                    ValidateAudience = true,
+                    ValidAudiences = new List<string> { "learninghubopenapi", "learninghubapi" },
+                };
             });
 
             services.AddCustomMiddleware();
@@ -151,6 +153,24 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
                 app.UseDeveloperExceptionPage();
             }
 
+            app.Use(async (context, next) =>
+            {
+                // Check context headers to determine which authentication scheme is appropriate
+                string scheme = ApiKeyDefaults.AuthenticationScheme;
+                if (context.Request.Headers.Keys.Contains("Authorization"))
+                {
+                    scheme = JwtBearerDefaults.AuthenticationScheme;
+                }
+
+                var result = await context.AuthenticateAsync(scheme);
+                if (result.Succeeded)
+                {
+                    context.User = result.Principal;
+                }
+
+                await next();
+            });
+
             app.UseStaticFiles(new StaticFileOptions
             {
                 FileProvider = new PhysicalFileProvider(Path.Combine(env.ContentRootPath, "SwaggerDefinitions")),

OpenAPI/LearningHub.Nhs.OpenApi/appsettings.json

@@ -13,7 +13,32 @@
     "NLogDb": "<configure-in-env-var>"
   },
   "Auth": {
-    "Clients": "<configure-in-env-var>"
+    "Clients": [
+      {
+        "Name": "KevWhitTest",
+        "Keys": [
+          ""
+        ]
+      },
+      {
+        "Name": "SoftwireDlsSignpostingDev",
+        "Keys": [
+          ""
+        ]
+      },
+      {
+        "Name": "DigitalLearningSolutions",
+        "Keys": [
+          ""
+        ]
+      },
+      {
+        "Name": "SoftwireMonitor",
+        "Keys": [
+          ""
+        ]
+      }
+    ]
   },
   "FindWise": {
     "SearchBaseUrl": "<configure-in-env-var>",