From 3dafc362edb6413ba7db2de13e8bf3d71cef2b50 Mon Sep 17 00:00:00 2001
From: Gauthier <mail@gauthierth.fr>
Date: Mon, 5 Aug 2024 16:13:32 +0200
Subject: [PATCH] fix(jellyfinapi): fix api key migration

---
 server/api/externalapi.ts    | 11 ++++++++---
 server/api/jellyfin.ts       |  4 ++--
 server/lib/settings/index.ts |  6 ------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/server/api/externalapi.ts b/server/api/externalapi.ts
index 2788db1e1..4f0ded026 100644
--- a/server/api/externalapi.ts
+++ b/server/api/externalapi.ts
@@ -85,7 +85,7 @@ class ExternalAPI {
 
   protected async post<T>(
     endpoint: string,
-    data: Record<string, unknown>,
+    data?: Record<string, unknown>,
     params?: Record<string, string>,
     ttl?: number,
     config?: RequestInit
@@ -107,7 +107,7 @@ class ExternalAPI {
         ...this.defaultHeaders,
         ...config?.headers,
       },
-      body: JSON.stringify(data),
+      body: data ? JSON.stringify(data) : undefined,
     });
     if (!response.ok) {
       const text = await response.text();
@@ -286,7 +286,12 @@ class ExternalAPI {
       ...this.params,
       ...params,
     });
-    return `${href}?${searchParams.toString()}`;
+    return (
+      href +
+      (searchParams.toString().length
+        ? '?' + searchParams.toString()
+        : searchParams.toString())
+    );
   }
 
   private serializeCacheKey(
diff --git a/server/api/jellyfin.ts b/server/api/jellyfin.ts
index 5710fcaf0..e5283517c 100644
--- a/server/api/jellyfin.ts
+++ b/server/api/jellyfin.ts
@@ -408,8 +408,8 @@ class JellyfinAPI extends ExternalAPI {
 
   public async createApiToken(appName: string): Promise<string> {
     try {
-      await this.axios.post(`/Auth/Keys?App=${appName}`);
-      const apiKeys = await this.get<any>('/Auth/Keys');
+      await this.post(`/Auth/Keys?App=${appName}`);
+      const apiKeys = await this.get<any>(`/Auth/Keys`);
       return apiKeys.Items.reverse().find(
         (item: any) => item.AppName === appName
       ).AccessToken;
diff --git a/server/lib/settings/index.ts b/server/lib/settings/index.ts
index 173eb7325..8c55d6c3d 100644
--- a/server/lib/settings/index.ts
+++ b/server/lib/settings/index.ts
@@ -658,7 +658,6 @@ class Settings {
   }
 }
 
-let loaded = false;
 let settings: Settings | undefined;
 
 export const getSettings = (initialSettings?: AllSettings): Settings => {
@@ -666,11 +665,6 @@ export const getSettings = (initialSettings?: AllSettings): Settings => {
     settings = new Settings(initialSettings);
   }
 
-  if (!loaded) {
-    settings.load();
-    loaded = true;
-  }
-
   return settings;
 };