mod: cleanup auth

Mod/API/Authentication.cs

@@ -2,42 +2,14 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net.Http;
 using System.Threading.Tasks;
 
 namespace ScoreTracker.API
 {
-    internal class AuthHelper
+    internal class SigninResponse
     {
-        public bool IsLoggedIn;
-        public string FailReason = "";
-
-        /// <summary>
-        /// Ensure the user is logged in
-        /// </summary>
-        /// <returns>the task</returns>
-        public async Task EnsureLoggedIn()
-        {
-            if (Authentication.IsSignedIn() && await Authentication.ValidateAuthToken())
-            {
-                return; // Already logged in with a valid token
-            }
-
-            await Authentication.LoginUser(
-                token => {
-                    IsLoggedIn = true;
-                    Request.PersistHeaders(new Dictionary<string, string>
-                    {
-                            { "Authorization", $"Bearer {token}" }
-                    });
-                },
-                reason =>
-                {
-                    FailReason = reason; // Store the reason for failure
-                    Request.HttpClient.DefaultRequestHeaders.Clear(); // Clear headers
-                }
-            );
-        }
+        public bool Success { get; set; }
+        public string Response { get; set; }
     }
 
     internal class Authentication
@@ -46,11 +18,42 @@ namespace ScoreTracker.API
         private static string _authToken;
 
         /// <summary>
-        /// Are we signed in?
+        /// Validate the auth token and sign in if necessary
         /// </summary>
-        public static bool IsSignedIn()
+        public static async Task<SigninResponse> ValidateAndSignIn()
         {
-            return _signedIn;
+            if (_signedIn && await ValidateAuthToken())
+            {
+                return new SigninResponse
+                {
+                    Success = true,
+                    Response = null
+                }; // Already signed in
+            }
+
+            bool success = false;
+            string response = null;
+
+            await LoginUser(
+                token => {
+                    success = true;
+                    Request.PersistHeaders(new Dictionary<string, string>
+                    {
+                            { "Authorization", $"Bearer {token}" }
+                    });
+                },
+                reason =>
+                {
+                    response = reason;
+                    Request.HttpClient.DefaultRequestHeaders.Clear(); // Clear headers
+                }
+            );
+
+            return new SigninResponse
+            {
+                Success = success,
+                Response = response
+            };
         }
 
         /// <summary>

Mod/API/Request.cs

@@ -35,11 +35,10 @@ namespace ScoreTracker.API
         {
             if (checkAuth)
             {
-                var authHelper = new AuthHelper();
-                await authHelper.EnsureLoggedIn();
-                if (!authHelper.IsLoggedIn)
+                var signinResponse = await Authentication.ValidateAndSignIn();
+                if (!signinResponse.Success)
                 {
-                    throw new Exception($"Failed to log in: {authHelper.FailReason}");
+                    throw new Exception($"Failed to log in: {signinResponse.Response}");
                 }
             }
             var jsonString = JsonConvert.SerializeObject(json, Formatting.None);