fix(deps): update dependency org.springframework.boot:spring-boot-starter-parent to v3.3.5

Reviewed-on: #17

.gitea/workflows/release-mod.yml

@@ -12,13 +12,13 @@ jobs:
       run:
         working-directory: "./Mod"
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup Running in CI Variable
         run: echo "RUNNING_IN_CI=true" >> $GITHUB_ENV
 
       - name: Setup dotnet
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 7.0.x
 

API/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.2</version>
+        <version>3.3.5</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -116,7 +116,7 @@
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>24.1.0</version>
+            <version>25.0.0</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

API/src/main/java/cc/fascinated/Main.java

@@ -39,7 +39,5 @@ public class Main {
 
         // Start the app
         SpringApplication.run(Main.class, args);
-
-
     }
 }

API/src/main/java/cc/fascinated/services/UserService.java

@@ -28,9 +28,9 @@ import java.util.concurrent.TimeUnit;
 @Log4j2(topic = "User Service")
 public class UserService {
     /**
-     * The interval to force update the user's account.
+     * The interval to refresh the user's account data from external services
      */
-    private static long FORCE_UPDATE_INTERVAL = TimeUnit.HOURS.toMillis(4);
+    private static long ACCOUNT_REFRESH_INTERVAL = TimeUnit.HOURS.toMillis(1);
 
     /**
      * The user repository to use
@@ -103,9 +103,9 @@ public class UserService {
 
         // Ensure the users ScoreSaber account is up-to-date
         ScoreSaberAccount scoresaberAccount = user.getScoresaberAccount();
-        if (scoresaberAccount == null || scoresaberAccount.getLastUpdated().before(new Date(System.currentTimeMillis() - FORCE_UPDATE_INTERVAL))) {
+        if (scoresaberAccount == null || scoresaberAccount.getLastUpdated().before(new Date(System.currentTimeMillis() - ACCOUNT_REFRESH_INTERVAL))) {
             try {
-                log.info("Updating account for '{}', last update: {}",
+                log.info("[Scoresaber] Updating account for '{}', last update: {}",
                         steamId,
                         scoresaberAccount == null ? "now" : TimeUtils.format(System.currentTimeMillis() - scoresaberAccount.getLastUpdated().getTime())
                 );
@@ -118,7 +118,7 @@ public class UserService {
                 historyToday.setCountryRank(accountToken.getCountryRank());
                 historyToday.setPp(accountToken.getPp());
             } catch (Exception ex) {
-                log.error("Failed to update ScoreSaber account for '{}'", steamId, ex);
+                log.error("[Scoresaber] Failed to update account for '{}'", steamId, ex);
             }
             shouldUpdate = true;
         }

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 bool Success { get; set; }
-        public string FailReason = "";
+        public string Response { get; set; }
-
-        /// <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
-                }
-            );
-        }
     }
 
     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();
+                var signinResponse = await Authentication.ValidateAndSignIn();
-                await authHelper.EnsureLoggedIn();
+                if (!signinResponse.Success)
-                if (!authHelper.IsLoggedIn)
                 {
-                    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);

Mod/Plugin.cs

@@ -40,8 +40,7 @@ namespace ScoreTracker
             // Ensure the user is logged in
             Task.Factory.StartNew(async () =>
             {
-                var authHelper = new AuthHelper();
+                await Authentication.ValidateAndSignIn(); // Ensure the user is signed in
-                await authHelper.EnsureLoggedIn();
             });
         }
 

Mod/Properties/AssemblyInfo.cs.d

@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("ScoreTracker")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("ScoreTracker")]
-[assembly: AssemblyCopyright("Copyright © Fascinated 2024")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("8d4a32fe-ab2a-4d8e-a53b-6a1d4f1d7bb9")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.0.1")]
-[assembly: AssemblyFileVersion("0.0.1")]

Mod/ScoreTracker.csproj

@@ -5,7 +5,6 @@
     <TargetFramework>net472</TargetFramework>
     <OutputType>Library</OutputType>
     <LangVersion>7.3</LangVersion>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <LocalRefsDir Condition="Exists('..\Refs')">..\Refs</LocalRefsDir>
     <BeatSaberDir>$(LocalRefsDir)</BeatSaberDir>
     <AppOutputBase>$(MSBuildProjectDirectory)\</AppOutputBase>
@@ -17,6 +16,9 @@
     <ErrorReport>prompt</ErrorReport>
     <Configurations>Release</Configurations>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DebugType>none</DebugType>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="BS_Utils, Version=1.12.0.0, Culture=neutral, processorArchitecture=MSIL">
       <Private>False</Private>
@@ -104,6 +106,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BeatSaberModdingTools.Tasks" Version="2.0.0-beta7" PrivateAssets="all" />
-    <PackageReference Include="BepInEx.AssemblyPublicizer.MSBuild" Version="0.4.1" PrivateAssets="all" />
+    <PackageReference Include="BepInEx.AssemblyPublicizer.MSBuild" Version="0.4.2" PrivateAssets="all" />
   </ItemGroup>
 </Project>