Update Packages That Could Be Updated

Rework Missed Refresh Token Code
Minor Version Bump

QtCNETAPI/QtCNETAPI.csproj

@@ -7,10 +7,11 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Meziantou.Framework.Win32.CredentialManager" Version="1.7.6" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.16" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.5" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.9" />
     <PackageReference Include="RestSharp" Version="112.1.0" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.10.0" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.14.0" />
   </ItemGroup>
 
 </Project>

QtCNETAPI/Services/ApiService/ApiService.cs

@@ -15,6 +15,8 @@ namespace QtCNETAPI.Services.ApiService
         private RestClient _client;
         private LoggingService _loggingService;
 
+        private CredentialService _credService = new();
+
         internal string? sessionToken;
         internal string apiUri;
 
@@ -411,21 +413,23 @@ namespace QtCNETAPI.Services.ApiService
         public async Task<ServiceResponse<string>> RefreshSessionIfInvalid()
         {
             var tokenHandler = new JwtSecurityTokenHandler();
-            var refToken = await File.ReadAllTextAsync("./session.token");
+            var refToken = _credService.GetAccessToken(); // fuck CA1416, if this is being ran on linux it should just crash (theoretically)
+
+            if (refToken == null)
+            {
+                // treat as session expired
+                return new ServiceResponse<string> { Success = false, Message = "Refresh Token Not Found. Session Expired." };
+            }
 
             JwtSecurityToken token = tokenHandler.ReadJwtToken(SessionToken);
 
             if(DateTime.Compare(DateTime.UtcNow, token.ValidTo) > 0)
             {
-                if (!File.Exists("./session.token")) { return new ServiceResponse<string> { Success = false, Message = "Session File Not Found. Session Expired." }; }
-
                 var result = await RefreshLogin(refToken);
 
                 if (result == null || result.Success == false)
                 {
-                    File.Delete("./session.token");
+                    return new ServiceResponse<string> { Success = false, Message = "Session Expired." }; // logging in again should overwrite old token
-
-                    return new ServiceResponse<string> { Success = false, Message = "Session Expired." };
                 } else return new ServiceResponse<string> { Success = true, Data = refToken };
             } else return new ServiceResponse<string> { Success = true, Data = refToken };
         }

QtCNETAPI/Services/CredentialService.cs

@@ -0,0 +1,26 @@
+using Meziantou.Framework.Win32;
+
+namespace QtCNETAPI.Services
+{
+    public class CredentialService()
+    {
+        public void SaveAccessToken(string username, string accessToken)
+        {
+            string applicationName = "QtC.NET";
+            if (System.Diagnostics.Debugger.IsAttached) applicationName = "QtC.NET.Development";
+
+            CredentialManager.WriteCredential(applicationName, username, accessToken, $"Access Token For User {username} On QtC.NET", CredentialPersistence.LocalMachine);
+        }
+
+        public string? GetAccessToken()
+        {
+            string applicationName = "QtC.NET";
+            if (System.Diagnostics.Debugger.IsAttached) applicationName = "QtC.NET.Development";
+
+            var credential = CredentialManager.ReadCredential(applicationName);
+            if (credential == null) return null;
+
+            return credential.Password;
+        }
+    }
+}

qtc-net-client-2/Forms/Login.Designer.cs

@@ -1,6 +1,6 @@
 namespace qtc_net_client_2.Forms
 {
-    partial class llblForgotPassword
+    partial class Login
     {
         /// <summary>
         /// Required designer variable.
@@ -28,7 +28,7 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(llblForgotPassword));
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Login));
             pbLoginBanner = new PictureBox();
             tbEmail = new TextBox();
             lblEmail = new Label();

qtc-net-client-2/Forms/Login.cs

@@ -1,4 +1,5 @@
 using QtCNETAPI.Services.ApiService;
+using QtCNETAPI.Services;
 using QtCNETAPI.Dtos.User;
 using System;
 using System.Collections.Generic;
@@ -13,11 +14,11 @@ using qtc_net_client_2.Services;
 
 namespace qtc_net_client_2.Forms
 {
-    public partial class llblForgotPassword : Form
+    public partial class Login : Form
     {
         private IApiService _apiService;
         private CredentialService _credService = new();
-        public llblForgotPassword(IApiService apiService)
+        public Login(IApiService apiService)
         {
             _apiService = apiService;
 

qtc-net-client-2/Forms/Main.cs

@@ -49,7 +49,7 @@ namespace qtc_net_client_2
             if (_apiService.CurrentUser == null)
             {
                 // not logged in, load the login form
-                llblForgotPassword frmLogin = new llblForgotPassword(_apiService);
+                Login frmLogin = new Login(_apiService);
                 var result = frmLogin.ShowDialog();
 
                 if (result == DialogResult.OK)
@@ -60,7 +60,7 @@ namespace qtc_net_client_2
         private async void llblSignIn_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
         {
             // just reshow the login dialog lol
-            llblForgotPassword frmLogin = new llblForgotPassword(_apiService);
+            Login frmLogin = new Login(_apiService);
             var result = frmLogin.ShowDialog();
 
             if (result == DialogResult.OK)

qtc-net-client-2/Properties/Resources.Designer.cs

@@ -81,7 +81,7 @@ namespace qtc_net_client_2.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to 6.3.3.
+        ///   Looks up a localized string similar to 6.3.4.
         /// </summary>
         internal static string AssemblyVersion {
             get {

qtc-net-client-2/Properties/Resources.resx

@@ -173,7 +173,7 @@
     <value>..\Icons\MessageIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="AssemblyVersion" xml:space="preserve">
-    <value>6.3.3</value>
+    <value>6.3.4</value>
   </data>
   <data name="cobalt_sittingatputer" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\cobalt_sittingatputer.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

qtc-net-client-2/Services/CredentialService.cs

@@ -1,17 +0,0 @@
-using Meziantou.Framework.Win32;
-
-namespace qtc_net_client_2.Services
-{
-    public class CredentialService()
-    {
-        public void SaveAccessToken(string username, string accessToken) => CredentialManager.WriteCredential("QtC.NET", username, accessToken, $"Access Token For User {username} On QtC.NET", CredentialPersistence.LocalMachine);
-
-        public string? GetAccessToken()
-        {
-            var credential = CredentialManager.ReadCredential("QtC.NET");
-            if (credential == null) return null;
-
-            return credential.Password;
-        }
-    }
-}

qtc-net-client-2/qtc-net-client-2.csproj

@@ -18,7 +18,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Meziantou.Framework.Win32.CredentialManager" Version="1.7.6" />
     <PackageReference Include="NAudio" Version="2.2.1" />
   </ItemGroup>