From 245fd3262d8f66a5474e2d9d7976b073df816884 Mon Sep 17 00:00:00 2001 From: Pranav C Date: Mon, 23 Sep 2024 10:12:16 +0000 Subject: [PATCH] refactor: redirect even if --- packages/nc-gui/plugins/redirect.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/nc-gui/plugins/redirect.ts b/packages/nc-gui/plugins/redirect.ts index ded64883fe..cfa3bd5a8e 100644 --- a/packages/nc-gui/plugins/redirect.ts +++ b/packages/nc-gui/plugins/redirect.ts @@ -24,12 +24,14 @@ export default defineNuxtPlugin(function (nuxtApp) { // put inside app:created hook to ensure global state is available nuxtApp.hooks.hook('app:created', () => { - const { token } = useGlobal() + const {token} = useGlobal() watch( () => token.value ?? (nuxtApp.$state as ReturnType)?.token?.value, async (newToken, oldToken) => { try { - if (newToken && newToken !== oldToken && isTokenUpdatedTab.value) { + // if token updated and continueAfterSignIn query param is present, redirect to that page + // or if token updated and isTokenUpdatedTab is true, redirect to the page stored in localStorage + if (newToken && newToken !== oldToken && (isTokenUpdatedTab.value || route.value.query?.continueAfterSignIn)) { try { if (route.value.query?.continueAfterSignIn) { await navigateTo(route.value.query.continueAfterSignIn as string, { @@ -52,7 +54,7 @@ export default defineNuxtPlugin(function (nuxtApp) { console.error(e) } }, - { immediate: true }, + {immediate: true}, ) }) })