Merge branch 'develop' into enhancement/filters

packages/nc-gui/components.d.ts

@@ -81,7 +81,6 @@ declare module '@vue/runtime-core' {
     ClaritySuccessLine: typeof import('~icons/clarity/success-line')['default']
     EvaEmailOutline: typeof import('~icons/eva/email-outline')['default']
     IcBaselineMoreVert: typeof import('~icons/ic/baseline-more-vert')['default']
-    Icon: typeof import('~icons/ic/on')['default']
     IcOutlineInsertDriveFile: typeof import('~icons/ic/outline-insert-drive-file')['default']
     IcRoundEdit: typeof import('~icons/ic/round-edit')['default']
     IcRoundKeyboardArrowDown: typeof import('~icons/ic/round-keyboard-arrow-down')['default']

packages/nc-gui/components/smartsheet/header/Menu.vue

@@ -162,6 +162,7 @@ const duplicateColumn = async () => {
     await getMeta(meta!.value!.id!, true)
 
     eventBus.emit(SmartsheetStoreEvents.FIELD_RELOAD)
+    reloadDataHook?.trigger()
 
     message.success(t('msg.success.columnDuplicated'))
   } catch (e) {

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

@@ -40,7 +40,6 @@ export function addAxiosInterceptors(api: Api<any>) {
       // Logout user if token refresh didn't work or user is disabled
       if (error.config.url === '/auth/token/refresh') {
         state.signOut()
-
         return Promise.reject(error)
       }
 

packages/nc-gui/composables/useGlobal/actions.ts

@@ -28,19 +28,22 @@ export function useGlobalActions(state: State): Actions {
     const nuxtApp = useNuxtApp()
     const t = nuxtApp.vueApp.i18n.global.t
 
-    nuxtApp.$api.instance
+    return new Promise((resolve) => {
-      .post('/auth/token/refresh', null, {
+      nuxtApp.$api.instance
-        withCredentials: true,
+        .post('/auth/token/refresh', null, {
-      })
+          withCredentials: true,
-      .then((response) => {
+        })
-        if (response.data?.token) {
+        .then((response) => {
-          signIn(response.data.token)
+          if (response.data?.token) {
-        }
+            signIn(response.data.token)
-      })
+          }
-      .catch((err) => {
+        })
-        message.error(err.message || t('msg.error.youHaveBeenSignedOut'))
+        .catch((err) => {
-        signOut()
+          message.error(err.message || t('msg.error.youHaveBeenSignedOut'))
-      })
+          signOut()
+        })
+        .finally(resolve)
+    })
   }
 
   const loadAppInfo = async () => {

packages/nc-gui/composables/useGlobal/index.ts

@@ -53,7 +53,7 @@ export const useGlobal = createGlobalState((): UseGlobalReturn => {
         state.jwtPayload.value.exp &&
         state.jwtPayload.value.exp - 5 * 60 < state.timestamp.value / 1000
       ),
-    async (expiring) => {
+    async (expiring: boolean) => {
       if (getters.signedIn.value && state.jwtPayload.value && expiring) {
         await actions.refreshToken()
       }

packages/nc-gui/middleware/auth.global.ts

@@ -52,7 +52,11 @@ export default defineNuxtRouteMiddleware(async (to, from) => {
       return navigateTo('/signup')
     }
 
-    return navigateTo('/signin')
+    /** try generating access token using refresh token */
+    await state.refreshToken()
+
+    /** if user is still not signed in, redirect to signin page */
+    if (!state.signedIn.value) return navigateTo('/signin')
   } else if (to.meta.requiresAuth === false && state.signedIn.value) {
     /**
      * if user was turned away from non-auth page but also came from a non-auth page (e.g. user went to /signin and reloaded the page)

packages/nocodb/src/lib/meta/api/userApi/userApis.ts

@@ -534,7 +534,7 @@ const mapRoutes = (router) => {
     '/user/password/change',
     ncMetaAclMw(passwordChange, 'passwordChange')
   );
-  router.post('/auth/token/refresh', ncMetaAclMw(refreshToken, 'refreshToken'));
+  router.post('/auth/token/refresh', catchError(refreshToken));
 
   /* Google auth apis */
 
@@ -573,10 +573,7 @@ const mapRoutes = (router) => {
     '/api/v1/db/auth/password/change',
     ncMetaAclMw(passwordChange, 'passwordChange')
   );
-  router.post(
+  router.post('/api/v1/db/auth/token/refresh', catchError(refreshToken));
-    '/api/v1/db/auth/token/refresh',
-    ncMetaAclMw(refreshToken, 'refreshToken')
-  );
   router.get(
     '/api/v1/db/auth/password/reset/:tokenId',
     catchError(renderPasswordReset)
@@ -607,10 +604,7 @@ const mapRoutes = (router) => {
     '/api/v1/auth/password/change',
     ncMetaAclMw(passwordChange, 'passwordChange')
   );
-  router.post(
+  router.post('/api/v1/auth/token/refresh', catchError(refreshToken));
-    '/api/v1/auth/token/refresh',
-    ncMetaAclMw(refreshToken, 'refreshToken')
-  );
   // respond with password reset page
   router.get('/auth/password/reset/:tokenId', catchError(renderPasswordReset));
 };