[hotfix] auth router (#268)

someengineering · Jul 12, 2024 · d29b518 · d29b518
1 parent e38a7ce
commit d29b518
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 23 deletions.
diff --git a/src/core/auth/AuthGuard.tsx b/src/core/auth/AuthGuard.tsx
@@ -85,12 +85,13 @@ export function AuthGuard({ children }: PropsWithChildren) {
           ? window.location.search
           : `?returnUrl=${window.encodeURIComponent(window.location.pathname + window.location.search + (noWorkspace ? '' : window.location.hash))}`,
       })
+      postHog.reset()
+      clearAllCookies()
+      handleInternalSetAuth(defaultAuth)
       try {
         await logoutMutation()
-      } finally {
-        postHog.reset()
-        clearAllCookies()
-        handleInternalSetAuth(defaultAuth)
+      } catch {
+        /* empty */
       }
     },
     [handleInternalSetAuth, navigate, postHog],

diff --git a/src/core/auth/RequireAuth.tsx b/src/core/auth/RequireAuth.tsx
@@ -1,5 +1,6 @@
 import { Outlet, useLocation } from 'react-router-dom'
 import { useAbsoluteNavigate } from 'src/shared/absolute-navigate'
+import { panelUI } from 'src/shared/constants'
 import { useUserProfile } from './useUserProfile'
 
 interface RequireAuthProps {
@@ -9,27 +10,29 @@ interface RequireAuthProps {
 export function RequireAuth({ reverse }: RequireAuthProps) {
   const navigate = useAbsoluteNavigate()
   const location = useLocation()
-  const user = useUserProfile()
+  const { isAuthenticated } = useUserProfile()
 
-  const isAuthenticated = !user.isAuthenticated && location.pathname !== '/auth/login'
-
-  if (isAuthenticated && !reverse) {
-    window.setTimeout(() => {
-      navigate(
-        {
-          pathname: '/auth/login',
-          search: location.search.includes('returnUrl')
-            ? location.search
-            : `returnUrl=${window.encodeURIComponent(`${location.pathname}${location.search}${location.hash}`)}`,
-        },
-        { replace: true },
-      )
-    })
+  if (!isAuthenticated && !reverse) {
+    if (!location.pathname.includes('/auth')) {
+      window.setTimeout(() => {
+        navigate(
+          {
+            pathname: '/auth/login',
+            search: location.search.includes('returnUrl')
+              ? location.search
+              : `returnUrl=${window.encodeURIComponent(`${location.pathname}${location.search}${location.hash}`)}`,
+          },
+          { replace: true },
+        )
+      })
+    }
     return null
-  } else if (reverse && !isAuthenticated) {
-    window.setTimeout(() => {
-      navigate(window.decodeURIComponent(location.search?.split('returnUrl=')[1]?.split('&')[0] ?? '/'), { replace: true })
-    })
+  } else if (reverse && isAuthenticated) {
+    if (location.pathname.includes('/auth')) {
+      window.setTimeout(() => {
+        navigate(window.decodeURIComponent(location.search?.split('returnUrl=')[1]?.split('&')[0] ?? panelUI.homePage), { replace: true })
+      })
+    }
     return null
   }