From f1d850a8c1b43a2769783d94ffb10d7f3cada9eb Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 17 Jan 2024 06:14:03 +0000
Subject: [PATCH] fix: base url correction

---
 packages/nc-gui/composables/useApi/index.ts        | 13 ++++++++-----
 packages/nc-gui/composables/useApi/interceptors.ts |  4 ++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/packages/nc-gui/composables/useApi/index.ts b/packages/nc-gui/composables/useApi/index.ts
index 0d196de4aa..9e4b77e412 100644
--- a/packages/nc-gui/composables/useApi/index.ts
+++ b/packages/nc-gui/composables/useApi/index.ts
@@ -6,14 +6,17 @@ import { addAxiosInterceptors } from './interceptors'
 import { BASE_FALLBACK_URL, createEventHook, extractSdkResponseErrorMsg, ref, unref, useCounter, useNuxtApp } from '#imports'
 
 export function createApiInstance<SecurityDataType = any>({
-  baseURL = BASE_FALLBACK_URL,
+  baseURL: _baseUrl = BASE_FALLBACK_URL,
 }: CreateApiOptions = {}): Api<SecurityDataType> {
   const config = useRuntimeConfig()
-
+  const baseURL = config.public.ncBackendUrl || _baseUrl
   return addAxiosInterceptors(
-    new Api<SecurityDataType>({
-      baseURL: config.public.ncBackendUrl || baseURL,
-    }),
+    new Api<SecurityDataType>(
+      {
+        baseURL,
+      },
+      baseUrl,
+    ),
   )
 }
 
diff --git a/packages/nc-gui/composables/useApi/interceptors.ts b/packages/nc-gui/composables/useApi/interceptors.ts
index 96e6bc08c3..4288f00d46 100644
--- a/packages/nc-gui/composables/useApi/interceptors.ts
+++ b/packages/nc-gui/composables/useApi/interceptors.ts
@@ -5,7 +5,7 @@ const DbNotFoundMsg = 'Database config not found'
 
 let refreshTokenPromise: Promise<string> | null = null
 
-export function addAxiosInterceptors(api: Api<any>) {
+export function addAxiosInterceptors(api: Api<any>, baseURL?: string) {
   const state = useGlobal()
   const router = useRouter()
   const route = router.currentRoute
@@ -99,7 +99,7 @@ export function addAxiosInterceptors(api: Api<any>) {
       return api.instance
         .post('/auth/token/refresh', null, {
           withCredentials: true,
-          baseURL: location.pathname,
+          baseURL: baseURL ?? './',
         })
         .then((token) => {
           // New request with new token