Merge pull request LykosAI#354 from ionite34/accounts-fixes

Author: ionite34

CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to Stability Matrix will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2.0.0.html).
 
+## v2.7.0-dev.2
+### Fixed
+- Fixed InvalidOperation errors when signing into accounts shortly after signing out, while the previous account update is still running
+
 ## v2.7.0-dev.1
 ### Added
 - Accounts Settings Subpage

StabilityMatrix.Avalonia/Services/AccountsService.cs

@@ -141,7 +141,11 @@ public async Task RefreshAsync()
 
     private async Task RefreshLykosAsync(Secrets secrets)
     {
-        if (secrets.LykosAccount is not null)
+        if (
+            secrets.LykosAccount is not null
+            && !string.IsNullOrWhiteSpace(secrets.LykosAccount?.RefreshToken)
+            && !string.IsNullOrWhiteSpace(secrets.LykosAccount?.AccessToken)
+        )
         {
             try
             {
@@ -157,6 +161,10 @@ private async Task RefreshLykosAsync(Secrets secrets)
             {
                 logger.LogWarning("Timed out while fetching Lykos Auth user info");
             }
+            catch (InvalidOperationException e)
+            {
+                logger.LogWarning(e, "Failed to get authentication token");
+            }
             catch (ApiException e)
             {
                 if (e.StatusCode is HttpStatusCode.Unauthorized) { }
@@ -165,6 +173,10 @@ private async Task RefreshLykosAsync(Secrets secrets)
                     logger.LogWarning(e, "Failed to get user info from Lykos");
                 }
             }
+            catch (Exception e)
+            {
+                logger.LogError(e, "Unknown error while refreshing Lykos account status");
+            }
         }
 
         OnLykosAccountStatusUpdate(LykosAccountStatusUpdateEventArgs.Disconnected);

StabilityMatrix.Avalonia/StabilityMatrix.Avalonia.csproj

@@ -8,7 +8,7 @@
         <ApplicationManifest>app.manifest</ApplicationManifest>
         <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
         <ApplicationIcon>./Assets/Icon.ico</ApplicationIcon>
-        <Version>2.7.0-dev.1</Version>
+        <Version>2.7.0-dev.2</Version>
         <InformationalVersion>$(Version)</InformationalVersion>
         <EnableWindowsTargeting>true</EnableWindowsTargeting>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>