Resolve Issue With Caching API Client Configuration

Author: AdrianJSClark

src/Aydsko.iRacingData.IntegrationTests/CachingIntegrationFixture.cs

@@ -13,7 +13,6 @@ internal abstract class CachingIntegrationFixture
     protected FakeTimeProvider FakeTimeProvider { get; private set; } = new FakeTimeProvider(DateTimeOffset.UtcNow);
 
     private LegacyUsernamePasswordApiClient? _legacyApiClient;
-    private ApiClient? _apiClientBase;
     private CachingApiClient? _cachingApiClientBase;
 
     [SetUp]
@@ -24,8 +23,12 @@ public void SetUp()
         MemoryCache = new MemoryCache(new MemoryCacheOptions() { TrackStatistics = true });
 
         _legacyApiClient = new(HttpClient, options, CookieContainer, new TestLogger<LegacyUsernamePasswordApiClient>());
-        _apiClientBase = new(_legacyApiClient, options, new TestLogger<ApiClient>());
-        _cachingApiClientBase = new(_apiClientBase, MemoryCache, new TestLogger<CachingApiClient>(), FakeTimeProvider);
+        _cachingApiClientBase = new(_legacyApiClient,
+                                    options,
+                                    MemoryCache,
+                                    new TestLogger<CachingApiClient>(),
+                                    new TestLogger<ApiClient>(),
+                                    FakeTimeProvider);
 
         Client = new DataClient(_cachingApiClientBase, options, new TestLogger<DataClient>(), FakeTimeProvider);
     }
@@ -35,7 +38,7 @@ protected override void Dispose(bool disposing)
         if (disposing)
         {
             _legacyApiClient?.Dispose();
-            _apiClientBase?.Dispose();
+            _cachingApiClientBase?.Dispose();
         }
 
         base.Dispose(disposing);

src/Aydsko.iRacingData/CachingApiClient.cs

@@ -3,12 +3,17 @@
 
 namespace Aydsko.iRacingData;
 
-internal sealed class CachingApiClient(ApiClient apiClient,
+internal sealed class CachingApiClient(IAuthenticatingHttpClient httpClient,
+                                       iRacingDataClientOptions options,
                                        IMemoryCache memoryCache,
                                        ILogger<CachingApiClient> logger,
+                                       ILogger<ApiClient> apiClientLogger,
                                        TimeProvider timeProvider)
-    : IApiClient
+    : IApiClient, IDisposable
 {
+    private readonly ApiClient apiClient = new(httpClient, options, apiClientLogger);
+    private bool disposedValue;
+
     public async Task<DataResponse<(THeader, TChunkData[])>> CreateResponseFromChunksAsync<THeader, TChunkData>(Uri uri,
                                                                                                                 bool isViaInfoLink,
                                                                                                                 JsonTypeInfo<THeader> jsonTypeInfo,
@@ -161,4 +166,34 @@ public void UseUsernameAndPassword(string username, string password, bool passwo
     {
         apiClient.UseUsernameAndPassword(username, password, passwordIsEncoded);
     }
+
+    private void Dispose(bool disposing)
+    {
+        if (!disposedValue)
+        {
+            if (disposing)
+            {
+                // TODO: dispose managed state (managed objects)
+                apiClient?.Dispose();
+            }
+
+            // TODO: free unmanaged resources (unmanaged objects) and override finalizer
+            // TODO: set large fields to null
+            disposedValue = true;
+        }
+    }
+
+    // // TODO: override finalizer only if 'Dispose(bool disposing)' has code to free unmanaged resources
+    // ~CachingApiClient()
+    // {
+    //     // Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method
+    //     Dispose(disposing: false);
+    // }
+
+    public void Dispose()
+    {
+        // Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method
+        Dispose(disposing: true);
+        GC.SuppressFinalize(this);
+    }
 }