Merge pull request #9873 from nocodb/nc-refresh-token-logic

fix: Handle sharedExecution timeout error in interceptor

packages/nc-gui/composables/useApi/interceptors.ts

@@ -1,6 +1,8 @@
 import type { Api } from 'nocodb-sdk'
 const DbNotFoundMsg = 'Database config not found'
 
+const TIMEOUT_RETRY_COUNT = 1
+
 export function addAxiosInterceptors(api: Api<any>) {
   const state = useGlobal()
   const router = useRouter()
@@ -61,37 +63,44 @@ export function addAxiosInterceptors(api: Api<any>) {
         return Promise.reject(error)
       }
 
-      try {
+      let retry = 0
-        const token = await state.refreshToken({
+      do {
-          axiosInstance,
+        try {
-          skipLogout: true,
+          const token = await state.refreshToken({
-        })
+            axiosInstance,
-
+            skipLogout: true,
-        if (!token) {
-          await state.signOut({
-            redirectToSignin: !isSharedPage,
-            skipApiCall: true,
           })
-          return Promise.reject(error)
-        }
-
-        const config = error.config
-        config.headers['xc-auth'] = token
 
-        const response = await axiosInstance.request(config)
+          if (!token) {
-        return response
+            await state.signOut({
-      } catch (refreshTokenError) {
+              redirectToSignin: !isSharedPage,
-        if ((refreshTokenError as any)?.code === 'ERR_CANCELED') {
+              skipApiCall: true,
-          return Promise.reject(refreshTokenError)
+            })
+            return Promise.reject(error)
+          }
+
+          const config = error.config
+          config.headers['xc-auth'] = token
+
+          const response = await axiosInstance.request(config)
+          return response
+        } catch (refreshTokenError) {
+          if ((refreshTokenError as any)?.code === 'ERR_CANCELED') {
+            return Promise.reject(refreshTokenError)
+          }
+
+          // if shared execution error, don't sign out
+          if (!(refreshTokenError instanceof SharedExecutionError)) {
+            await state.signOut({
+              redirectToSignin: !isSharedPage,
+              skipApiCall: true,
+            })
+            return Promise.reject(error)
+          }
+
+          if (retry >= TIMEOUT_RETRY_COUNT) return Promise.reject(error)
         }
-
+      } while (retry++ < TIMEOUT_RETRY_COUNT)
-        await state.signOut({
-          redirectToSignin: !isSharedPage,
-          skipApiCall: true,
-        })
-
-        return Promise.reject(error)
-      }
     },
   )
 

packages/nc-gui/composables/useSharedExecutionFn.ts

@@ -1,5 +1,11 @@
 import { useStorage, useTimeoutFn } from '@vueuse/core'
 
+export class SharedExecutionError extends Error {
+  constructor(message?: string) {
+    super(message)
+  }
+}
+
 interface SharedExecutionOptions {
   timeout?: number // Maximum time a lock can be held before it's considered stale - default 5000ms
   storageDelay?: number // Delay before reading from storage to allow for changes to propagate - default 50ms
@@ -102,7 +108,7 @@ export function useSharedExecutionFn<T>(key: string, fn: () => Promise<T> | T, o
           () => {
             timedOut = true
             localStorage.removeItem(storageLockKey)
-            reject(new Error(`Timeout waiting for result on key ${key}`))
+            reject(new SharedExecutionError(`Timeout waiting for result on key ${key}`))
           },
           currentLock?.timestamp ? timeout - (Date.now() - currentLock.timestamp) : timeout,
         )