Update HttpClientExtensions.cs

Author: samanazadi1996

Source/Tests/CleanArchitecture.FunctionalTests/Common/HttpClientExtensions.cs

@@ -5,75 +5,35 @@ namespace CleanArchitecture.FunctionalTests.Common;
 
 public static class HttpClientExtensions
 {
-    static readonly JsonSerializerOptions DefaultJsonOptions = new()
+    private static readonly JsonSerializerOptions DefaultJsonOptions = new()
     {
         PropertyNamingPolicy = JsonNamingPolicy.CamelCase
     };
 
     public static async Task<T> GetAndDeserializeAsync<T>(this HttpClient client, string requestUri, string? token = null)
-    {
-        var request = new HttpRequestMessage(HttpMethod.Get, requestUri);
-
-        if (!string.IsNullOrEmpty(token))
-        {
-            request.Headers.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", token);
-        }
+        => await client.BuildAndSendRequest<T>(HttpMethod.Get, requestUri, token);
 
-        HttpResponseMessage response = await client.SendAsync(request);
-        response.EnsureSuccessStatusCode();
-        string text = await response.Content.ReadAsStringAsync();
-
-        return JsonSerializer.Deserialize<T>(text, DefaultJsonOptions)!;
-    }
     public static async Task<T> PostAndDeserializeAsync<T>(this HttpClient client, string requestUri, object? model = null, string? token = null)
-    {
-        string jsonContent = JsonSerializer.Serialize(model, DefaultJsonOptions);
-        var content = new StringContent(jsonContent, Encoding.UTF8, "application/json");
-
-        var request = new HttpRequestMessage(HttpMethod.Post, requestUri)
-        {
-            Content = content
-        };
+        => await client.BuildAndSendRequest<T>(HttpMethod.Post, requestUri, token, model);
 
-        if (!string.IsNullOrEmpty(token))
-        {
-            request.Headers.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", token);
-        }
+    public static async Task<T> PutAndDeserializeAsync<T>(this HttpClient client, string requestUri, object? model = null, string? token = null)
+        => await client.BuildAndSendRequest<T>(HttpMethod.Put, requestUri, token, model);
 
-        HttpResponseMessage response = await client.SendAsync(request);
+    public static async Task<T> DeleteAndDeserializeAsync<T>(this HttpClient client, string requestUri, string? token = null)
+        => await client.BuildAndSendRequest<T>(HttpMethod.Delete, requestUri, token);
 
-        string text = await response.Content.ReadAsStringAsync();
-        return JsonSerializer.Deserialize<T>(text, DefaultJsonOptions)!;
-    }
-    public static async Task<T> PutAndDeserializeAsync<T>(this HttpClient client, string requestUri, object? model = null, string? token = null)
+    private static async Task<T> BuildAndSendRequest<T>(this HttpClient client, HttpMethod method, string requestUri, string? token, object? model = null)
     {
-        string jsonContent = JsonSerializer.Serialize(model, DefaultJsonOptions);
-        var content = new StringContent(jsonContent, Encoding.UTF8, "application/json");
+        var request = new HttpRequestMessage(method, requestUri);
 
-        var request = new HttpRequestMessage(HttpMethod.Put, requestUri)
+        if (model is not null)
         {
-            Content = content
-        };
-
-        if (!string.IsNullOrEmpty(token))
-        {
-            request.Headers.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", token);
+            var json = JsonSerializer.Serialize(model, DefaultJsonOptions);
+            request.Content = new StringContent(json, Encoding.UTF8, "application/json");
         }
 
-        HttpResponseMessage response = await client.SendAsync(request);
-
-        string text = await response.Content.ReadAsStringAsync();
-
-        return JsonSerializer.Deserialize<T>(text, DefaultJsonOptions)!;
-    }
-    public static async Task<T> DeleteAndDeserializeAsync<T>(this HttpClient client, string requestUri, string? token = null)
-    {
-        var request = new HttpRequestMessage(HttpMethod.Delete, requestUri);
-
         if (!string.IsNullOrEmpty(token))
-        {
-            request.Headers.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", token);
-        }
+            request.Headers.Authorization = new("Bearer", token);
 
         HttpResponseMessage response = await client.SendAsync(request);