chore: trying to get PDS changes to work in azure

Author: SamRobinson75684

application/CohortManager/src/Functions/DemographicServices/RetrievePDSDemographic/RetrievePDSDemographic.cs

@@ -50,6 +50,7 @@ public async Task<HttpResponseData> Run([HttpTrigger(AuthorizationLevel.Anonymou
     {
         var nhsNumber = req.Query["nhsNumber"];
 
+        
         var bearerToken = await _bearerTokenService.GetBearerToken();
         if (bearerToken == null)
         {

application/CohortManager/src/Functions/Shared/Common/AuthorizationClientCredentials.cs

@@ -12,12 +12,15 @@ public class AuthorizationClientCredentials : IAuthorizationClientCredentials
     private readonly IJwtTokenService _jwtHandler;
     private readonly JwtTokenServiceConfig _JwtTokenServiceConfig;
 
-    public AuthorizationClientCredentials(IJwtTokenService jwtTokenService, HttpClient httpClient, IOptions<JwtTokenServiceConfig> JwtTokenServiceConfig)
+    private readonly ILogger<AuthorizationClientCredentials> _logger;
+
+    public AuthorizationClientCredentials(IJwtTokenService jwtTokenService, HttpClient httpClient, IOptions<JwtTokenServiceConfig> JwtTokenServiceConfig, ILogger<AuthorizationClientCredentials> logger)
     {
         _httpClient = httpClient;
         _jwtHandler = jwtTokenService;
 
         _JwtTokenServiceConfig = JwtTokenServiceConfig.Value;
+        _logger = logger;
     }
 
     public async Task<string?> AccessToken(int expInMinutes = 1)
@@ -33,15 +36,15 @@ public AuthorizationClientCredentials(IJwtTokenService jwtTokenService, HttpClie
         var content = new FormUrlEncodedContent(values);
 
         var response = await _httpClient.PostAsync(_JwtTokenServiceConfig.AuthTokenURL, content);
+        var resBody = await response.Content.ReadAsStringAsync();
 
         if (response.StatusCode != HttpStatusCode.OK)
         {
+            _logger.LogError("there was an error getting the bearer token from the NHS token service. Response: {resBody}", resBody);
             return null;
         }
 
-        var resBody = await response.Content.ReadAsStringAsync();
         var parsed = JsonNode.Parse(resBody);
-
         return parsed?["access_token"]?.ToString();
     }
 }

application/CohortManager/src/Functions/Shared/Common/BearerTokenService.cs

@@ -23,12 +23,14 @@ public BearerTokenService(
     }
     public async Task<string> GetBearerToken()
     {
+
         if (_memoryCache.TryGetValue(AccessTokenCacheKey, out string? bearerToken))
         {
+            _logger.LogInformation("bearer token found in memory cache");
             return bearerToken!;
         }
 
-        _logger.LogInformation("Refreshing bearer token...");
+        _logger.LogInformation("Token not found in memory cache refreshing bearer token...");
         bearerToken = await _authClientCredentials.AccessToken();
 
         if (bearerToken == null)

application/CohortManager/src/Functions/Shared/Common/Extensions/JwtTokenExtension.cs

@@ -7,9 +7,11 @@ namespace Common;
 using Azure.Security.KeyVault.Secrets;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
 
 public static class JwtTokenExtension
 {
+
     /// <summary>
     /// gets the private key from the local dir or from keyvault if the function is running in azure
     /// </summary>
@@ -18,40 +20,53 @@ public static class JwtTokenExtension
     /// <returns></returns>
     public static IHostBuilder AddJwtTokenSigning(this IHostBuilder hostBuilder, bool useFakeBearerTokenService = false)
     {
-        JwtPrivateKey jwtPrivateKey;
-        // Azure   
-        hostBuilder.AddConfiguration<JwtTokenServiceConfig>(out JwtTokenServiceConfig config);
-        if (!string.IsNullOrEmpty(config.KeyVaultConnectionString))
-        {
-            var certClient = new CertificateClient(vaultUri: new Uri(config.KeyVaultConnectionString), credential: new DefaultAzureCredential());
-            var privateKey = certClient.DownloadCertificate(config.KeyNamePrivateKey);
-
-            jwtPrivateKey = new JwtPrivateKey(CertificateToString(privateKey));
-        }
-        // Local
-        else
-        {
-            jwtPrivateKey = new JwtPrivateKey(GetPrivateKey(config.LocalPrivateKeyFileName));
-        }
+        var loggerFactory = LoggerFactory.Create(builder => builder.AddConsole());
+        var logger = loggerFactory.CreateLogger("program.cs");
 
-        var host = hostBuilder.ConfigureServices(_ =>
+        JwtPrivateKey jwtPrivateKey;
+        try
         {
-            _.AddMemoryCache();
-            _.AddSingleton(jwtPrivateKey);
-            _.AddSingleton<IAuthorizationClientCredentials, AuthorizationClientCredentials>();
-            _.AddSingleton<IJwtTokenService, JwtTokenService>();
-            _.AddSingleton<ISigningCredentialsProvider, SigningCredentialsProvider>();
-            if (!useFakeBearerTokenService)
+            // Azure   
+            hostBuilder.AddConfiguration<JwtTokenServiceConfig>(out JwtTokenServiceConfig config);
+            if (!string.IsNullOrEmpty(config.KeyVaultConnectionString))
             {
-                _.AddSingleton<IBearerTokenService, BearerTokenService>();
+                var certClient = new CertificateClient(vaultUri: new Uri(config.KeyVaultConnectionString), credential: new DefaultAzureCredential());
+                var privateKey = certClient.DownloadCertificate(config.KeyNamePrivateKey);
+
+                logger.LogInformation("got certificate from key vault");
+                jwtPrivateKey = new JwtPrivateKey(CertificateToString(privateKey.Value));
             }
+            // Local
             else
             {
-                _.AddSingleton<IBearerTokenService, BearerTokenServiceMock>();
+                jwtPrivateKey = new JwtPrivateKey(GetPrivateKey(config.LocalPrivateKeyFileName));
             }
-        });
 
-        return host;
+            var host = hostBuilder.ConfigureServices(_ =>
+            {
+                _.AddMemoryCache();
+                _.AddSingleton(jwtPrivateKey);
+                _.AddSingleton<IAuthorizationClientCredentials, AuthorizationClientCredentials>();
+                _.AddSingleton<IJwtTokenService, JwtTokenService>();
+                _.AddSingleton<ISigningCredentialsProvider, SigningCredentialsProvider>();
+                if (!useFakeBearerTokenService)
+                {
+                    _.AddSingleton<IBearerTokenService, BearerTokenService>();
+                }
+                else
+                {
+                    _.AddSingleton<IBearerTokenService, BearerTokenServiceMock>();
+                }
+            });
+
+            return host;
+        }
+        catch (Exception ex)
+        {
+            logger.LogError(ex, ex.Message);
+            throw;
+        }
+
     }
 
     private static string CertificateToString(X509Certificate2 certificate)