Merge branch 'feature/173197-New-Endpoints' of https://github.com/DFE…

…-Digital/academies-api into feature/173197-New-Endpoints
DFE-Digital · Sep 30, 2024 · 0b1fb36 · 0b1fb36
2 parents f98bd75 + 14ed949
commit 0b1fb36
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 102 deletions.
diff --git a/Dfe.Academies.Api.Infrastructure/Security/ApiKeyOrRoleHandler.cs b/Dfe.Academies.Api.Infrastructure/Security/ApiKeyOrRoleHandler.cs
diff --git a/Dfe.Academies.Api.Infrastructure/Security/Authorization/ApiKeyOrRoleRequirement.cs b/Dfe.Academies.Api.Infrastructure/Security/Authorization/ApiKeyOrRoleRequirement.cs
diff --git a/Dfe.Academies.Api.Infrastructure/Security/Authorization/AuthorizationExtensions.cs b/Dfe.Academies.Api.Infrastructure/Security/Authorization/AuthorizationExtensions.cs
@@ -12,42 +12,37 @@ public static class AuthorizationExtensions
     {
         public static IServiceCollection AddCustomAuthorization(this IServiceCollection services, IConfiguration configuration)
         {
-            // Add both Azure AD (JWT) and API Key authentication mechanisms
-            services.AddAuthentication(options =>
-            {
-                options.DefaultScheme = JwtBearerDefaults.AuthenticationScheme;
-            })
-            .AddMicrosoftIdentityWebApi(configuration.GetSection("AzureAd"));
+            services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
+                .AddMicrosoftIdentityWebApi(configuration.GetSection("AzureAd"));
 
             services.AddAuthorization(options =>
             {
+                options.DefaultPolicy = new AuthorizationPolicyBuilder()
+                    .RequireAuthenticatedUser()
+                    .Build();
+
                 var roles = configuration.GetSection("Authorization:Roles").Get<string[]>();
                 if (roles != null)
                 {
                     foreach (var role in roles)
                     {
-                        options.AddPolicy(role, policy =>
-                        {
-                            policy.Requirements.Add(new ApiKeyOrRoleRequirement(role));
-                        });
+                        options.AddPolicy(role, policy => policy.RequireRole(role));
                     }
                 }
 
-                // Add claim-based policies
                 var claims = configuration.GetSection("Authorization:Claims").Get<Dictionary<string, string>>();
-
-                if (claims == null) return;
-
-                foreach (var claim in claims)
+                if (claims != null)
                 {
-                    options.AddPolicy($"{claim.Key}", policy =>
-                        policy.RequireClaim(claim.Key, claim.Value));
+                    foreach (var claim in claims)
+                    {
+                        options.AddPolicy($"{claim.Key}", policy =>
+                            policy.RequireClaim(claim.Key, claim.Value));
+                    }
                 }
             });
 
-            services.AddSingleton<IAuthorizationHandler, ApiKeyOrRoleHandler>();
-
             return services;
         }
     }
+
 }
diff --git a/Dfe.PersonsApi.Client/Security/TokenAcquisitionService.cs b/Dfe.PersonsApi.Client/Security/TokenAcquisitionService.cs
@@ -8,29 +8,25 @@ namespace Dfe.PersonsApi.Client.Security
     public class TokenAcquisitionService : ITokenAcquisitionService
     {
         private readonly PersonsApiClientSettings _settings;
-        private readonly IConfidentialClientApplication _app;
-        private AuthenticationResult? _authResult;
+        private readonly Lazy<IConfidentialClientApplication> _app;
 
         public TokenAcquisitionService(PersonsApiClientSettings settings)
         {
-            _settings = settings;
+            _settings = settings ?? throw new ArgumentNullException(nameof(settings));
 
-            _app = ConfidentialClientApplicationBuilder.Create(_settings.ClientId)
-                .WithClientSecret(_settings.ClientSecret)
-                .WithAuthority(new Uri(_settings.Authority!))
-                .Build();
+            _app = new Lazy<IConfidentialClientApplication>(() =>
+                ConfidentialClientApplicationBuilder.Create(_settings.ClientId)
+                    .WithClientSecret(_settings.ClientSecret)
+                    .WithAuthority(new Uri(_settings.Authority!))
+                    .Build());
         }
 
         public async Task<string> GetTokenAsync()
         {
-            // Check if the current token is about to expire
-            if (_authResult == null || _authResult.ExpiresOn <= DateTimeOffset.UtcNow.AddMinutes(-1))
-            {
-                _authResult = await _app.AcquireTokenForClient(new[] { _settings.Scope })
-                                        .ExecuteAsync();
-            }
+            var authResult = await _app.Value.AcquireTokenForClient(new[] { _settings.Scope })
+                .ExecuteAsync();
 
-            return _authResult.AccessToken;
+            return authResult.AccessToken;
         }
     }
-}
+}
diff --git a/PersonsApi/appsettings.Development.json b/PersonsApi/appsettings.Development.json
@@ -13,12 +13,6 @@
     }
   },
   "AllowedHosts": "*",
-  "ApiKeys": [
-    {
-      "UserName": "Demo User",
-      "ApiKey": "app-key"
-    }
-  ],
   "ConnectionStrings": {
     "DefaultConnection": "Server=localhost;Database=sip;User ID=sa;Password=StrongPassword905;TrustServerCertificate=True"
   },

diff --git a/PersonsApi/appsettings.json b/PersonsApi/appsettings.json
@@ -17,12 +17,6 @@
     "ConnectionString": "Copy connection string from Application Insights Resource Overview"
   },
   "AllowedHosts": "*",
-  "ApiKeys": [
-    {
-      "UserName": "Demo User",
-      "ApiKey": "app-key"
-    }
-  ],
   "SyncAcademyConversionProjectsSchedule": "0 0/15 * * * *",
   "Serilog": {
     "Using": [