Merge pull request #1130 from SamSmithNZ-dotcom/copilot/fix-stream-disposal-base-service-api-client

Fix resource disposal in BaseServiceApiClient

Author: samsmithnz

src/SamSmithNZ.Web/Services/BaseServiceAPIClient.cs

@@ -18,10 +18,10 @@ public void SetupClient(HttpClient client)
 
         public async Task<List<T>> ReadMessageList<T>(Uri url)
         {
-            HttpResponseMessage response = await _client.GetAsync(url);
+            using HttpResponseMessage response = await _client.GetAsync(url);
             if (response.IsSuccessStatusCode == true)
             {
-                Stream stream = await response.Content.ReadAsStreamAsync();
+                await using Stream stream = await response.Content.ReadAsStreamAsync();
                 if (stream != null && stream.Length > 0)
                 {
                     return await JsonSerializer.DeserializeAsync<List<T>>(stream);
@@ -40,10 +40,10 @@ public async Task<List<T>> ReadMessageList<T>(Uri url)
 
         public async Task<T> ReadMessageItem<T>(Uri url)
         {
-            HttpResponseMessage response = await _client.GetAsync(url);
+            using HttpResponseMessage response = await _client.GetAsync(url);
             if (response.IsSuccessStatusCode == true)
             {
-                Stream stream = await response.Content.ReadAsStreamAsync();
+                await using Stream stream = await response.Content.ReadAsStreamAsync();
                 if (stream != null && stream.Length > 0)
                 {
                     return await JsonSerializer.DeserializeAsync<T>(stream);
@@ -65,8 +65,8 @@ public async Task<T> ReadMessageItem<T>(Uri url)
         public async Task<bool> SaveMessageItem<T>(Uri url, T obj)
         {
             string jsonInString = JsonSerializer.Serialize(obj);
-            StringContent content = new(jsonInString, Encoding.UTF8, "application/json");
-            HttpResponseMessage response = await _client.PostAsync(url, content);
+            using StringContent content = new(jsonInString, Encoding.UTF8, "application/json");
+            using HttpResponseMessage response = await _client.PostAsync(url, content);
             if (response.IsSuccessStatusCode == true)
             {
                 return true;
@@ -84,8 +84,8 @@ public async Task<T> SaveAndReturnMessageItem<T>(Uri url, T obj)
         {
             T result = default;
             string jsonInString = JsonSerializer.Serialize(obj);
-            StringContent content = new(jsonInString, Encoding.UTF8, "application/json");
-            HttpResponseMessage response = await _client.PostAsync(url, content);
+            using StringContent content = new(jsonInString, Encoding.UTF8, "application/json");
+            using HttpResponseMessage response = await _client.PostAsync(url, content);
             if (response.IsSuccessStatusCode == true)
             {
                 string responseString = await response.Content.ReadAsStringAsync();
@@ -101,10 +101,10 @@ public async Task<T> SaveAndReturnMessageItem<T>(Uri url, T obj)
         //The type, R, is different than T. For example, if T is an Album, R is typically a string or int.
         public async Task<R> GetMessageScalar<R>(Uri url)
         {
-            HttpResponseMessage response = await _client.GetAsync(url);
+            using HttpResponseMessage response = await _client.GetAsync(url);
             if (response.IsSuccessStatusCode == true)
             {
-                Stream stream = await response.Content.ReadAsStreamAsync();
+                await using Stream stream = await response.Content.ReadAsStreamAsync();
                 if (stream != null && stream.Length > 0)
                 {
                     return await JsonSerializer.DeserializeAsync<R>(stream);