Merge pull request LykosAI#1004 from ionite34/backport/main/pr-1003

[dev to main] backport: Fix borked autoupdate (1003)

Author: mohnjiles

StabilityMatrix.Core/Api/LykosAuthApi/.refitter

@@ -1,5 +1,5 @@
 {
-  "openApiPath": "https://stableauthentication-dev.azurewebsites.net/swagger/v2/swagger.json",
+  "openApiPath": "https://auth.lykos.ai/swagger/v2/swagger.json",
   "outputFolder": "./StabilityMatrix.Core/Api/LykosAuthApi/Generated",
   "outputFilename": "Refitter.g.cs",
   "namespace": "StabilityMatrix.Core.Api.LykosAuthApi",
@@ -9,7 +9,8 @@
   },
   "includePathMatches": [
     "^/api/v2/Accounts/me$",
-    "^/api/v2/oauth/patreon"
+    "^/api/v2/oauth/patreon",
+    "^/api/v2/files/download"
   ],
   "trimUnusedSchema": true,
   "operationNameGenerator": "SingleClientFromPathSegments"

StabilityMatrix.Core/Api/LykosAuthApi/Generated/Refitter.g.cs

@@ -37,6 +37,32 @@ public partial interface ILykosAuthApiV2
         [Get("/api/v2/Accounts/me")]
         Task<AccountResponse> ApiV2AccountsMe();
 
+        /// <returns>OK</returns>
+        /// <exception cref="ApiException">
+        /// Thrown when the request returns a non-success status code:
+        /// <list type="table">
+        /// <listheader>
+        /// <term>Status</term>
+        /// <description>Description</description>
+        /// </listheader>
+        /// <item>
+        /// <term>400</term>
+        /// <description>Bad Request</description>
+        /// </item>
+        /// <item>
+        /// <term>401</term>
+        /// <description>Unauthorized</description>
+        /// </item>
+        /// <item>
+        /// <term>403</term>
+        /// <description>Forbidden</description>
+        /// </item>
+        /// </list>
+        /// </exception>
+        [Headers("Accept: text/plain, application/json, text/json")]
+        [Get("/api/v2/files/download")]
+        Task<FilesDownloadResponse> ApiV2FilesDownload([Query] string path);
+
         /// <returns>A <see cref="Task"/> that completes when the request is finished.</returns>
         /// <exception cref="ApiException">
         /// Thrown when the request returns a non-success status code:
@@ -174,6 +200,18 @@ public partial class AccountResponse
 
     }
 
+    [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.2.0.0 (NJsonSchema v11.1.0.0 (Newtonsoft.Json v13.0.0.0))")]
+    public partial class FilesDownloadResponse
+    {
+
+        [JsonPropertyName("downloadUrl")]
+        public System.Uri DownloadUrl { get; set; }
+
+        [JsonPropertyName("expiresAt")]
+        public System.DateTimeOffset? ExpiresAt { get; set; }
+
+    }
+
     [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "14.2.0.0 (NJsonSchema v11.1.0.0 (Newtonsoft.Json v13.0.0.0))")]
     public partial class ProblemDetails
     {

StabilityMatrix.Core/Updater/UpdateHelper.cs

@@ -3,7 +3,7 @@
 using Injectio.Attributes;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using StabilityMatrix.Core.Api;
+using StabilityMatrix.Core.Api.LykosAuthApi;
 using StabilityMatrix.Core.Extensions;
 using StabilityMatrix.Core.Helper;
 using StabilityMatrix.Core.Models.Configs;
@@ -21,7 +21,7 @@ public class UpdateHelper : IUpdateHelper
     private readonly IHttpClientFactory httpClientFactory;
     private readonly IDownloadService downloadService;
     private readonly ISettingsManager settingsManager;
-    private readonly ILykosAuthApiV1 lykosAuthApi;
+    private readonly ILykosAuthApiV2 lykosAuthApi;
     private readonly DebugOptions debugOptions;
     private readonly System.Timers.Timer timer = new(TimeSpan.FromMinutes(60));
 
@@ -45,7 +45,7 @@ public UpdateHelper(
         IDownloadService downloadService,
         IOptions<DebugOptions> debugOptions,
         ISettingsManager settingsManager,
-        ILykosAuthApiV1 lykosAuthApi
+        ILykosAuthApiV2 lykosAuthApi
     )
     {
         this.logger = logger;
@@ -101,7 +101,7 @@ public async Task DownloadUpdate(UpdateInfo updateInfo, IProgress<ProgressReport
                 var path = updateInfo.Url.PathAndQuery.StripStart(authedPathPrefix);
                 path = HttpUtility.UrlDecode(path);
                 url = (
-                    await lykosAuthApi.GetFilesDownload(path).ConfigureAwait(false)
+                    await lykosAuthApi.ApiV2FilesDownload(path).ConfigureAwait(false)
                 ).DownloadUrl.ToString();
             }