adding token refresh

Author: greyWizardCode

ECommerce.AdminUI/Services/AuthService.cs

@@ -27,22 +27,22 @@ public AuthService(IHttpClientFactory httpClientFactory, ILogger<AuthService> lo
                 Encoding.UTF8,
                 "application/json");
 
-            _logger.LogInformation("Generating token for user {UserName}, request body: {RequestBody}", 
+            _logger.LogInformation("Generating token for user {UserName}, request body: {RequestBody}",
                 userName, JsonSerializer.Serialize(request));
-                
+
             var response = await _httpClient.PostAsync("/modulith/admin/generateToken", content);
-            
+
             // Read the raw response for debugging
             var tokenString = await response.Content.ReadAsStringAsync();
-            _logger.LogInformation("Response status: {Status}, Content: {Content}", 
+            _logger.LogInformation("Response status: {Status}, Content: {Content}",
                 response.StatusCode, tokenString);
-            
+
             if (!response.IsSuccessStatusCode)
             {
                 _logger.LogError("Token generation failed with status code {StatusCode}", response.StatusCode);
                 return null;
             }
-            
+
             // The response is plain text containing the token, not JSON
             return !string.IsNullOrWhiteSpace(tokenString) ? tokenString.Trim() : null;
         }
@@ -53,6 +53,86 @@ public AuthService(IHttpClientFactory httpClientFactory, ILogger<AuthService> lo
         }
     }
 
+    public async Task<string?> RefreshTokenAsync(string token)
+    {
+        try
+        {
+            _logger.LogDebug("Attempting to refresh token");
+
+            var request = new HttpRequestMessage(HttpMethod.Post, "/modulith/admin/refreshToken");
+            request.Headers.Add("Authorization", $"Bearer {token}");
+
+            var response = await _httpClient.SendAsync(request);
+
+            if (!response.IsSuccessStatusCode)
+            {
+                _logger.LogWarning("Token refresh failed with status code {StatusCode}", response.StatusCode);
+                return null;
+            }
+
+            var newToken = await response.Content.ReadAsStringAsync();
+            _logger.LogInformation("Token refreshed successfully");
+            return !string.IsNullOrWhiteSpace(newToken) ? newToken.Trim() : null;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error refreshing token");
+            return null;
+        }
+    }
+
+    // Helper method to execute authenticated requests with automatic refresh
+    public async Task<(bool Success, HttpResponseMessage? Response)> ExecuteWithTokenRefreshAsync(
+        Func<string, Task<HttpResponseMessage>> apiCall,
+        string token,
+        string username,
+        HttpContext httpContext)
+    {
+        try
+        {
+            // First attempt with current token
+            var response = await apiCall(token);
+
+            // If successful, return the response
+            if (response.IsSuccessStatusCode)
+            {
+                return (true, response);
+            }
+
+            // If we get a 401 Unauthorized, try refreshing the token
+            if (response.StatusCode == System.Net.HttpStatusCode.Unauthorized)
+            {
+                _logger.LogInformation("Received 401 Unauthorized, attempting to refresh token");
+
+                // Try to refresh the token
+                var newToken = await RefreshTokenAsync(token);
+
+                if (!string.IsNullOrEmpty(newToken))
+                {
+                    // Update token in session
+                    httpContext.Session.SetString("AuthToken", newToken);
+
+                    // Retry the API call with the new token
+                    var retryResponse = await apiCall(newToken);
+                    return (retryResponse.IsSuccessStatusCode, retryResponse);
+                }
+
+                // If refresh fails, clear the token and return false
+                _logger.LogWarning("Token refresh failed, user needs to re-authenticate");
+                httpContext.Session.Remove("AuthToken");
+                return (false, null);
+            }
+
+            // For other error responses, just return as is
+            return (false, response);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error executing authenticated request");
+            return (false, null);
+        }
+    }
+
     public class TokenRequest
     {
         public string UserName { get; set; } = string.Empty;

ECommerce.AdminUI/Services/BaseService.cs

@@ -0,0 +1,40 @@
+using Microsoft.AspNetCore.Http;
+
+namespace ECommerce.AdminUI.Services
+{
+    public abstract class BaseService
+    {
+        protected readonly IHttpContextAccessor HttpContextAccessor;
+        protected readonly AuthService AuthService;
+        protected readonly ILogger Logger;
+
+        protected BaseService(
+            IHttpContextAccessor httpContextAccessor,
+            AuthService authService,
+            ILogger logger)
+        {
+            HttpContextAccessor = httpContextAccessor;
+            AuthService = authService;
+            Logger = logger;
+        }
+
+        protected string? GetTokenFromSession()
+        {
+            return HttpContextAccessor.HttpContext?.Session.GetString("AuthToken");
+        }
+
+        protected string? GetUsernameFromSession()
+        {
+            return HttpContextAccessor.HttpContext?.Session.GetString("Username");
+        }
+
+        protected void AddAuthorizationHeader(HttpClient httpClient, string token)
+        {
+            if (!string.IsNullOrEmpty(token))
+            {
+                httpClient.DefaultRequestHeaders.Remove("Authorization");
+                httpClient.DefaultRequestHeaders.Add("Authorization", $"Bearer {token}");
+            }
+        }
+    }
+}