fix: deployment auth sometimes has problems if configured with polly

Author: davhdavh

Catglobe.CgScript.Deployment/DeploymentAuthHandler.cs

@@ -1,50 +1,10 @@
-using System.Net.Http.Json;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-using Microsoft.Extensions.Options;
+namespace Catglobe.CgScript.Deployment;
 
-namespace Catglobe.CgScript.Deployment;
-
-internal partial class DeploymentAuthHandler(IOptions<DeploymentOptions> options) : DelegatingHandler
+internal class DeploymentAuthHandler(DeploymentAuthenticator authenticator) : DelegatingHandler
 {
-   private string? _accessToken;
-
    protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
    {
-      if (_accessToken is null) await AcquireToken(cancellationToken);
-      request.Headers.Authorization = new("Bearer", _accessToken);
+      request.Headers.Authorization = new("Bearer", await authenticator.GetToken(cancellationToken));
       return await base.SendAsync(request, cancellationToken);
    }
-
-   private async Task AcquireToken(CancellationToken cancellationToken)
-   {
-      var o          = options.Value;
-      var httpClient = new HttpClient();
-      httpClient.BaseAddress = options.Value.Authority;
-      var requestData = new Dictionary<string, string> {
-         {"grant_type", "client_credentials"},
-         {"client_id", o.ClientId},
-         {"client_secret", o.ClientSecret},
-         // ReSharper disable once StringLiteralTypo
-         {"scope", "scriptdeployment:w"},
-      };
-
-      var requestMessage = new HttpRequestMessage(HttpMethod.Post, "/connect/token") { Content = new FormUrlEncodedContent(requestData), Headers = { Accept = { new("application/json") } } };
-
-      var response = await httpClient.SendAsync(requestMessage, cancellationToken);
-      response.EnsureSuccessStatusCode();
-
-      var tokenResponse = await response.Content.ReadFromJsonAsync(Serializer.Default.TokenResponse, cancellationToken) ?? throw new IOException("Failed to obtain authorization");
-
-      _accessToken = tokenResponse.AccessToken;
-   }
-
-   private class TokenResponse
-   {
-      [JsonPropertyName("access_token")] public string AccessToken { get; set; } = null!;
-   }
-
-   [JsonSerializable(typeof(TokenResponse))]
-   [JsonSourceGenerationOptions(JsonSerializerDefaults.Web)]
-   private partial class Serializer : JsonSerializerContext;
-}
+}

Catglobe.CgScript.Deployment/DeploymentAuthenticator.cs

@@ -0,0 +1,44 @@
+using System.Net.Http.Json;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Microsoft.Extensions.Options;
+
+namespace Catglobe.CgScript.Deployment;
+
+internal partial class DeploymentAuthenticator(HttpClient httpClient, IOptions<DeploymentOptions> options)
+{
+   private string? _accessToken;
+
+   public async Task<string> GetToken(CancellationToken cancellationToken) => _accessToken ??= await AcquireToken(cancellationToken).ConfigureAwait(false);
+
+   private async Task<string> AcquireToken(CancellationToken cancellationToken)
+   {
+      var o          = options.Value;
+      httpClient.BaseAddress = options.Value.Authority;
+      var requestData = new Dictionary<string, string> {
+         {"grant_type", "client_credentials"},
+         {"client_id", o.ClientId},
+         {"client_secret", o.ClientSecret},
+         // ReSharper disable once StringLiteralTypo
+         {"scope", "scriptdeployment:w"},
+      };
+
+      var requestMessage = new HttpRequestMessage(HttpMethod.Post, "/connect/token") { Content = new FormUrlEncodedContent(requestData), Headers = { Accept = { new("application/json") } } };
+
+      var response = await httpClient.SendAsync(requestMessage, cancellationToken).ConfigureAwait(false);
+      response.EnsureSuccessStatusCode();
+
+      var tokenResponse = await response.Content.ReadFromJsonAsync(Serializer.Default.TokenResponse, cancellationToken).ConfigureAwait(false) ?? throw new IOException("Failed to obtain authorization");
+
+      return tokenResponse.AccessToken;
+   }
+
+   private class TokenResponse
+   {
+      [JsonPropertyName("access_token")] public string AccessToken { get; set; } = null!;
+   }
+
+   [JsonSerializable(typeof(TokenResponse))]
+   [JsonSourceGenerationOptions(JsonSerializerDefaults.Web)]
+   private partial class Serializer : JsonSerializerContext;
+}

Catglobe.CgScript.Deployment/HostExtensions.cs

@@ -38,6 +38,7 @@ public static IServiceCollection AddCgScriptDeployment(this IServiceCollection s
    private static IServiceCollection AddCommonCgScript(IServiceCollection services)
    {
       services.TryAddSingleton<IScriptProvider, FilesFromDirectoryScriptProvider>();
+      services.AddScoped<DeploymentAuthenticator>();
       services.AddScoped<DeploymentAuthHandler>();
       services.AddHttpClient<IDeployer, Deployer>((sp, httpClient) => {
                   var site = sp.GetRequiredService<IOptions<DeploymentOptions>>().Value.Authority;