From c9fa3c72df7f6f461d7a10954a8bfac7a665268d Mon Sep 17 00:00:00 2001 From: becem-gharbi Date: Sat, 9 Mar 2024 14:56:41 +0100 Subject: [PATCH] refactor(auth): remove extra token check If `firstTime` is "true" then the token cannot defined. --- src/runtime/plugins/auth.ts | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/runtime/plugins/auth.ts b/src/runtime/plugins/auth.ts index 1cbf90f..bc66f04 100644 --- a/src/runtime/plugins/auth.ts +++ b/src/runtime/plugins/auth.ts @@ -28,17 +28,13 @@ export default defineNuxtPlugin(async (nuxtApp) => { const firstTime = (process.server && !isPrerenderd) || (process.client && (!isServerRendered || isPrerenderd)) if (firstTime) { - if (token.value) { - await useDirectusAuth().fetchUser() - } else { - const isCallback = useRoute().path === config.auth.redirect.callback - const { _refreshToken, refresh } = useDirectusSession() + const isCallback = useRoute().path === config.auth.redirect.callback + const { _refreshToken, refresh } = useDirectusSession() - if (isCallback || _loggedInFlag.value || _refreshToken.get()) { - await refresh() - if (token.value) { - await useDirectusAuth().fetchUser() - } + if (isCallback || _loggedInFlag.value || _refreshToken.get()) { + await refresh() + if (token.value) { + await useDirectusAuth().fetchUser() } } }