refactor: cleaner getApiUrl usage

keephq · Nov 25, 2024 · 841dc6b · 841dc6b
1 parent cef5d21
commit 841dc6b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/keep-ui/shared/lib/api/ApiClient.ts b/keep-ui/shared/lib/api/ApiClient.ts
@@ -2,6 +2,7 @@ import { InternalConfig } from "@/types/internal-config";
 import { Session } from "next-auth";
 import { KeepApiError } from "./KeepApiError";
 import { getApiUrlFromConfig } from "./getApiUrlFromConfig";
+import { getApiURL } from "@/utils/apiUrl";
 
 export class ApiClient {
   constructor(
@@ -58,7 +59,9 @@ export class ApiClient {
   }
 
   async fetch(url: string, requestInit: RequestInit = {}) {
-    const apiUrl = getApiUrlFromConfig(this.config, this.isServer);
+    const apiUrl = this.isServer
+      ? getApiURL()
+      : getApiUrlFromConfig(this.config);
     const fullUrl = apiUrl + url;
 
     if (!this.config) {

diff --git a/keep-ui/shared/lib/api/getApiUrlFromConfig.ts b/keep-ui/shared/lib/api/getApiUrlFromConfig.ts
@@ -1,8 +1,5 @@
 import { InternalConfig } from "@/types/internal-config";
 
-export function getApiUrlFromConfig(
-  config: InternalConfig | null,
-  isServer: boolean = false
-) {
-  return isServer ? config?.API_URL : config?.API_URL_CLIENT || "/backend";
+export function getApiUrlFromConfig(config: InternalConfig | null) {
+  return config?.API_URL_CLIENT || "/backend";
 }