refactor: cleanup

Author: paul-fresquet

src/ByteSync.Client/Services/Communications/Api/AnnouncementApiClient.cs

@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
 using ByteSync.Common.Business.Announcements;
 using ByteSync.Interfaces.Controls.Communications.Http;
 
@@ -10,13 +7,13 @@ public class AnnouncementApiClient : IAnnouncementApiClient
 {
     private readonly IApiInvoker _apiInvoker;
     private readonly ILogger<AnnouncementApiClient> _logger;
-
+    
     public AnnouncementApiClient(IApiInvoker apiInvoker, ILogger<AnnouncementApiClient> logger)
     {
         _apiInvoker = apiInvoker;
         _logger = logger;
     }
-
+    
     public async Task<List<Announcement>> GetAnnouncements()
     {
         try
@@ -26,7 +23,8 @@ public async Task<List<Announcement>> GetAnnouncements()
         catch (Exception ex)
         {
             _logger.LogError(ex, "Error while retrieving announcements");
+            
             throw;
         }
     }
-}
+}

src/ByteSync.Client/Services/Communications/Api/ApiInvoker.cs

@@ -1,11 +1,8 @@
-using System.Net;
-using System.Net.Http;
+using System.Net.Http;
 using System.Text;
 using System.Text.Json;
 using System.Threading;
-using System.Threading.Tasks;
 using ByteSync.Common.Controls.Json;
-using ByteSync.Common.Helpers;
 using ByteSync.Exceptions;
 using ByteSync.Interfaces.Controls.Communications.Http;
 using ByteSync.Interfaces.Services.Communications;
@@ -19,59 +16,63 @@ public class ApiInvoker : IApiInvoker
     private readonly IConnectionConstantsService _connectionConstantsService;
     private readonly ILogger<ApiInvoker> _logger;
 
-    public ApiInvoker(IHttpClientFactory httpClientFactory, IAuthenticationTokensRepository authenticationTokensRepository, 
+    public ApiInvoker(IHttpClientFactory httpClientFactory, IAuthenticationTokensRepository authenticationTokensRepository,
         IConnectionConstantsService connectionConstantsService, ILogger<ApiInvoker> logger)
     {
         _httpClient = httpClientFactory.CreateClient("ApiClient");
         _authenticationTokensRepository = authenticationTokensRepository;
         _connectionConstantsService = connectionConstantsService;
         _logger = logger;
     }
-
+    
     public Task<T> GetAsync<T>(string resource, CancellationToken cancellationToken = default)
     {
         return InvokeRestAsync<T>(HttpMethod.Get, resource, null, null, cancellationToken);
     }
-
+    
     public Task<T> PostAsync<T>(string resource, object? postObject, CancellationToken cancellationToken = default)
     {
         return InvokeRestAsync<T>(HttpMethod.Post, resource, null, postObject, cancellationToken);
     }
-
+    
     public Task<T> DeleteAsync<T>(string resource, object objectToDelete, CancellationToken cancellationToken = default)
     {
         return InvokeRestAsync<T>(HttpMethod.Delete, resource, null, objectToDelete, cancellationToken);
     }
-
+    
     public Task PostAsync(string resource, object? postObject, CancellationToken cancellationToken = default)
     {
         return DoInvokeRestAsync<object>(HttpMethod.Post, resource, null, postObject, false, cancellationToken);
     }
-
-    private async Task<T> InvokeRestAsync<T>(HttpMethod httpVerb, string resource, Dictionary<string, string>? additionalHeaders, object? requestObject,
+    
+    private async Task<T> InvokeRestAsync<T>(HttpMethod httpVerb, string resource, Dictionary<string, string>? additionalHeaders,
+        object? requestObject,
         CancellationToken cancellationToken)
     {
         return await DoInvokeRestAsync<T>(httpVerb, resource, additionalHeaders, requestObject, true, cancellationToken);
     }
-
-    private async Task<T> DoInvokeRestAsync<T>(HttpMethod httpMethod, string resource, Dictionary<string, string>? additionalHeaders, 
+    
+    private async Task<T> DoInvokeRestAsync<T>(HttpMethod httpMethod, string resource, Dictionary<string, string>? additionalHeaders,
         object? requestObject, bool handleResult, CancellationToken cancellationToken)
     {
         using var request = await BuildRequest(httpMethod, resource, additionalHeaders, requestObject);
-
+        
         try
         {
             var response = await _httpClient.SendAsync(request, cancellationToken);
+            
             return await HandleResponse<T>(handleResult, response);
         }
         catch (Exception ex)
         {
             _logger.LogError(ex, "Exception occurred while invoking API: {Resource}", resource);
+            
             throw new ApiException($"An error occurred while invoking the API on resource {resource}", ex);
         }
     }
-
-    private async Task<HttpRequestMessage> BuildRequest(HttpMethod httpMethod, string resource, Dictionary<string, string>? additionalHeaders,
+    
+    private async Task<HttpRequestMessage> BuildRequest(HttpMethod httpMethod, string resource,
+        Dictionary<string, string>? additionalHeaders,
         object? requestObject)
     {
         var rootUrl = await _connectionConstantsService.GetApiUrl();
@@ -80,10 +81,11 @@ private async Task<HttpRequestMessage> BuildRequest(HttpMethod httpMethod, strin
         var request = new HttpRequestMessage(httpMethod, fullUrl);
 
         var jwtToken = await _authenticationTokensRepository.GetTokens();
-        if (jwtToken != null && !jwtToken.JwtToken.IsNullOrEmpty()) 
+        if (jwtToken != null && !jwtToken.JwtToken.IsNullOrEmpty())
         {
-            request.Headers.Add("authorization", jwtToken.JwtToken);   
+            request.Headers.Add("authorization", jwtToken.JwtToken);
         }
+        
         if (additionalHeaders is { Count: > 0 })
         {
             foreach (var header in additionalHeaders)
@@ -97,14 +99,14 @@ private async Task<HttpRequestMessage> BuildRequest(HttpMethod httpMethod, strin
             var json = JsonHelper.Serialize(requestObject);
             request.Content = new StringContent(json, Encoding.UTF8, "application/json");
         }
-
+        
         return request;
     }
-
+    
     private async Task<T> HandleResponse<T>(bool handleResult, HttpResponseMessage response)
     {
         var content = await response.Content.ReadAsStringAsync();
-
+        
         if (response.IsSuccessStatusCode)
         {
             if (handleResult)
@@ -128,12 +130,13 @@ private async Task<T> HandleResponse<T>(bool handleResult, HttpResponseMessage r
             {
                 return DeserializeContent<T>(content);
             }
-
+            
             _logger.LogError("API call failed with status code {StatusCode}: {ErrorMessage}", response.StatusCode, errorMessage);
+            
             throw new ApiException($"API call failed with status code {response.StatusCode}: {errorMessage}", response.StatusCode);
         }
     }
-
+    
     private T DeserializeContent<T>(string content)
     {
         try
@@ -143,12 +146,13 @@ private T DeserializeContent<T>(string content)
             {
                 throw new ApiException("Failed to deserialize the response content.");
             }
-
+            
             return result;
         }
         catch (JsonException ex)
         {
             _logger.LogError(ex, "JSON deserialization error");
+            
             throw new ApiException("Failed to deserialize the response content.", ex);
         }
     }

src/ByteSync.Client/Services/Communications/Api/AuthApiClient.cs

@@ -1,5 +1,4 @@
 using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
 using ByteSync.Common.Business.Auth;
 using ByteSync.Interfaces.Controls.Communications.Http;
 using Serilog;
@@ -20,33 +19,33 @@ public AuthApiClient(IApiInvoker apiInvoker)
         try
         {
             var result = await _apiInvoker.PostAsync<InitialAuthenticationResponse>($"auth/login", loginData);
-
+            
             return result;
         }
         catch (Exception ex)
         {
             LogError(ex);
-                
+            
             throw;
         }
     }
-
+    
     public async Task<RefreshTokensResponse?> RefreshAuthenticationTokens(RefreshTokensData refreshTokensData)
     {
         try
         {
             var result = await _apiInvoker.PostAsync<RefreshTokensResponse>($"auth/refreshTokens", refreshTokensData);
-
+            
             return result;
         }
         catch (Exception ex)
         {
             LogError(ex);
-                
+            
             throw;
         }
     }
-
+    
     private void LogError(Exception exception, [CallerMemberName] string caller = "")
     {
         // ReSharper disable once TemplateIsNotCompileTimeConstantProblem