fix: sign-out and empty content (#1654)

elk-zone · Feb 6, 2023 · f7a8d47 · f7a8d47
1 parent 6e7ac24
commit f7a8d47
Showing 1 changed file with 17 additions and 10 deletions.
diff --git a/middleware/auth.ts b/middleware/auth.ts
@@ -1,18 +1,25 @@
+import type { RouteLocationNormalized } from 'vue-router'
+
 export default defineNuxtRouteMiddleware((to) => {
   if (process.server)
     return
 
   if (to.path === '/signin/callback')
     return
 
-  onHydrated(() => {
-    if (!currentUser.value) {
-      if (to.path === '/home' && to.query['share-target'] !== undefined)
-        return navigateTo('/share-target')
-      else
-        return navigateTo(`/${currentServer.value}/public/local`)
-    }
-    if (to.path === '/')
-      return navigateTo('/home')
-  })
+  if (isHydrated.value)
+    return handleAuth(to)
+
+  onHydrated(() => handleAuth(to))
 })
+
+function handleAuth(to: RouteLocationNormalized) {
+  if (!currentUser.value) {
+    if (to.path === '/home' && to.query['share-target'] !== undefined)
+      return navigateTo('/share-target')
+    else
+      return navigateTo(`/${currentServer.value}/public/local`)
+  }
+  if (to.path === '/')
+    return navigateTo('/home')
+}