fix: HttpClientFactory 생명주기 불일치(Scope Capture) 문제를 회피하기 위해 CRM API 클라이언트에 직접 토큰 주입하도록 전면 개편

2026-06-29 15:43:15 +09:00
parent 3e1097f585
commit 5807e1b35e
7 changed files with 90 additions and 18 deletions
@@ -16,15 +16,24 @@ public interface IContractBrowserClient
    Task DeleteAsync(int id, CancellationToken ct = default);
 }

-public class ContractBrowserClient(HttpClient httpClient, ILogger<ContractBrowserClient> logger)
+public class ContractBrowserClient(HttpClient httpClient, ITokenStore tokenStore, ILogger<ContractBrowserClient> logger)
    : IContractBrowserClient
 {
    private const string BaseUrl = "/api/contract";

+    private void EnsureAuthHeader()
+    {
+        if (!string.IsNullOrEmpty(tokenStore.AccessToken))
+            httpClient.DefaultRequestHeaders.Authorization = new("Bearer", tokenStore.AccessToken);
+        else
+            httpClient.DefaultRequestHeaders.Authorization = null;
+    }
+
    public async Task<List<Contract>> GetAllAsync(CancellationToken ct = default)
    {
        try
        {
+            EnsureAuthHeader();
            return await httpClient.GetFromJsonAsync<List<Contract>>($"{BaseUrl}", ct) ?? [];
        }
        catch (Exception ex)
@@ -38,6 +47,7 @@ public class ContractBrowserClient(HttpClient httpClient, ILogger<ContractBrowse
    {
        try
        {
+            EnsureAuthHeader();
            return await httpClient.GetFromJsonAsync<Contract>($"{BaseUrl}/{id}", ct);
        }
        catch (Exception ex)
@@ -51,6 +61,7 @@ public class ContractBrowserClient(HttpClient httpClient, ILogger<ContractBrowse
    {
        try
        {
+            EnsureAuthHeader();
            return await httpClient.GetFromJsonAsync<List<Contract>>($"{BaseUrl}/client/{clientId}", ct) ?? [];
        }
        catch (Exception ex)
@@ -64,6 +75,7 @@ public class ContractBrowserClient(HttpClient httpClient, ILogger<ContractBrowse
    {
        try
        {
+            EnsureAuthHeader();
            var response = await httpClient.GetFromJsonAsync<JsonElement>($"{BaseUrl}/active", ct);
            if (response.TryGetProperty("data", out var data))
                return System.Text.Json.JsonSerializer.Deserialize<List<Contract>>(data.GetRawText()) ?? [];
@@ -80,6 +92,7 @@ public class ContractBrowserClient(HttpClient httpClient, ILogger<ContractBrowse
    {
        try
        {
+            EnsureAuthHeader();
            var response = await httpClient.GetFromJsonAsync<JsonElement>($"{BaseUrl}/expiring?daysAhead={daysAhead}", ct);
            if (response.TryGetProperty("data", out var data))
                return System.Text.Json.JsonSerializer.Deserialize<List<Contract>>(data.GetRawText()) ?? [];
@@ -96,6 +109,7 @@ public class ContractBrowserClient(HttpClient httpClient, ILogger<ContractBrowse
    {
        try
        {
+            EnsureAuthHeader();
            var response = await httpClient.GetFromJsonAsync<JsonElement>($"{BaseUrl}/mrr", ct);
            if (response.TryGetProperty("mrr", out var mrrValue))
                return System.Text.Json.JsonSerializer.Deserialize<decimal>(mrrValue.GetRawText());
@@ -113,6 +127,7 @@ public class ContractBrowserClient(HttpClient httpClient, ILogger<ContractBrowse
    {
        try
        {
+            EnsureAuthHeader();
            var request = new { clientId, contractNumber, serviceType, startDate, monthlyFee, totalAmount };
            var response = await httpClient.PostAsJsonAsync(BaseUrl, request, ct);
            response.EnsureSuccessStatusCode();
@@ -130,6 +145,7 @@ public class ContractBrowserClient(HttpClient httpClient, ILogger<ContractBrowse
    {
        try
        {
+            EnsureAuthHeader();
            var response = await httpClient.DeleteAsync($"{BaseUrl}/{id}", ct);
            response.EnsureSuccessStatusCode();
        }