fix: avoid auto-logout on SSR error

becem-gharbi · Mar 9, 2024 · 921662e · 921662e
1 parent 309f48d
commit 921662e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/runtime/middleware/auth.ts b/src/runtime/middleware/auth.ts
@@ -2,7 +2,8 @@ import { useAuthToken } from '../composables/useAuthToken'
 import {
   defineNuxtRouteMiddleware,
   useRuntimeConfig,
-  navigateTo
+  navigateTo,
+  useNuxtApp
 } from '#imports'
 
 export default defineNuxtRouteMiddleware((to) => {
@@ -15,7 +16,10 @@ export default defineNuxtRouteMiddleware((to) => {
     return
   }
 
-  if (publicConfig.enableGlobalAuthMiddleware && to.meta.auth === false) {
+  // Makes sure no infinite redirections on ssr error
+  const isSSRError = process.server && typeof useNuxtApp().payload.error !== 'undefined'
+
+  if (isSSRError || (publicConfig.enableGlobalAuthMiddleware && to.meta.auth === false)) {
     return
   }
 

diff --git a/src/runtime/plugins/flow.ts b/src/runtime/plugins/flow.ts
@@ -25,9 +25,10 @@ export default defineNuxtPlugin(async (nuxtApp) => {
     /**
      * Makes sure to refresh access token and set user state if possible (run once)
      */
+    const isSSRError = typeof nuxtApp.payload.error !== 'undefined'
     const isPrerenderd = typeof nuxtApp.payload.prerenderedAt === 'number'
     const isServerRendered = nuxtApp.payload.serverRendered
-    const firstTime = (process.server && !isPrerenderd) || (process.client && (!isServerRendered || isPrerenderd))
+    const firstTime = (process.server && !isPrerenderd && !isSSRError) || (process.client && (!isServerRendered || isPrerenderd || isSSRError))
 
     if (firstTime) {
       const isCallback = useRoute().path === publicConfig.redirect.callback