Dispose

Author: BenjaminMichaelis

EssentialCSharp.Web.Tests/Integration/CaptchaTests.cs

@@ -43,13 +43,22 @@ public static ServiceProvider CreateServiceProvider()
     }
     public void Dispose()
     {
-        ServiceProvider.Dispose();
+        Dispose(disposing: true);
         GC.SuppressFinalize(this);
     }
 
+    protected virtual void Dispose(bool disposing)
+    {
+        if (disposing)
+        {
+            ServiceProvider.Dispose();
+        }
+    }
+
     public async ValueTask DisposeAsync()
     {
-        await ServiceProvider.DisposeAsync();
+        await ServiceProvider.DisposeAsync().ConfigureAwait(false);
+        Dispose(disposing: false);
         GC.SuppressFinalize(this);
     }
 }

EssentialCSharp.Web.Tests/WebApplicationFactory.cs

@@ -105,6 +105,17 @@ public void InServiceScope(Action<IServiceProvider> action)
         action(scope.ServiceProvider);
     }
 
+    public override async ValueTask DisposeAsync()
+    {
+        await base.DisposeAsync().ConfigureAwait(false);
+        if (_Connection != null)
+        {
+            await _Connection.DisposeAsync().ConfigureAwait(false);
+            _Connection = null;
+        }
+        GC.SuppressFinalize(this);
+    }
+
     protected override void Dispose(bool disposing)
     {
         base.Dispose(disposing);

EssentialCSharp.Web/Services/CaptchaService.cs

@@ -41,10 +41,9 @@ public class CaptchaService(IHttpClientFactory clientFactory, IOptions<CaptchaOp
         HttpClient client = ClientFactory.CreateClient("hCaptcha");
 
         // request api
-        HttpResponseMessage res = await client.PostAsync(
-            // base url is given in IHttpClientFactory service registration
-            // hCaptcha wants URL-encoded POST
-            "/siteverify", new FormUrlEncodedContent(postData), cancellationToken);
+        // hCaptcha wants URL-encoded POST; base url is given in IHttpClientFactory service registration
+        using FormUrlEncodedContent content = new(postData);
+        HttpResponseMessage res = await client.PostAsync("/siteverify", content, cancellationToken);
 
         res.EnsureSuccessStatusCode();
         // convert JSON string into Class