Fixed exception handling

BUTR · Feb 23, 2024 · bf5fac3 · bf5fac3
1 parent fb4f339
commit bf5fac3
Showing 1 changed file with 33 additions and 12 deletions.
diff --git a/src/BUTR.Site.NexusMods.Client/Services/HttpClient/AuthenticationAnd401DelegatingHandler.cs b/src/BUTR.Site.NexusMods.Client/Services/HttpClient/AuthenticationAnd401DelegatingHandler.cs
@@ -1,5 +1,7 @@
 using Blazorise;
 
+using BUTR.Site.NexusMods.ServerClient;
+
 using System;
 using System.Net;
 using System.Net.Http;
@@ -18,21 +20,40 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
         if (await _tokenContainer.GetTokenAsync(ct) is { Type: "demo" })
             return new HttpResponseMessage(HttpStatusCode.OK) { Content = new StringContent("{}", Encoding.UTF8, "application/json") };
 
-        var response = await base.SendAsync(request, ct);
-
-        if (response.StatusCode == HttpStatusCode.Unauthorized)
+        try
         {
-            await _tokenContainer.SetTokenAsync(null, ct);
-            await _notificationService.Error("Authentication failure! Please log in again!", "Error!");
+            var response = await base.SendAsync(request, ct);
+
+            if (response.StatusCode == HttpStatusCode.Unauthorized)
+            {
+                await _tokenContainer.SetTokenAsync(null, ct);
+                await _notificationService.Error("Authentication failure! Please log in again!", "Error!");
+            }
+
+            // Cloudflare timeout
+            if ((int) response.StatusCode == 522)
+            {
+                await _notificationService.Error("Backend is down! Notify about the issue on GitHub https://github.com/BUTR/BUTR.Site.NexusMods", "Error!");
+            }
+
+            return response;
         }
-
-        // Cloudflare timeout
-        if ((int) response.StatusCode == 522)
+        catch (ApiException e)
         {
-            Console.WriteLine(522);
-            await _notificationService.Error("Backend is down! Notify about the issue on GitHub https://github.com/BUTR/BUTR.Site.NexusMods", "Error!");
+            // Cloudflare timeout
+            if ( e.StatusCode == (int)HttpStatusCode.Unauthorized)
+            {
+                await _tokenContainer.SetTokenAsync(null, ct);
+                await _notificationService.Error("Authentication failure! Please log in again!", "Error!");
+            }
+
+            // Cloudflare timeout
+            if (e.StatusCode == 522)
+            {
+                await _notificationService.Error("Backend is down! Notify about the issue on GitHub https://github.com/BUTR/BUTR.Site.NexusMods", "Error!");
+            }
+
+            throw;
         }
-
-        return response;
     }
 }