[fix] do not show login screen when already authenticated (#266)

someengineering · Jul 11, 2024 · 75ecf99 · 75ecf99
1 parent 0a7dfc4
commit 75ecf99
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/src/AppRouter.tsx b/src/AppRouter.tsx
@@ -31,7 +31,9 @@ export const AppRouter = memo(
   () => (
     <Suspense fallback={<FullPageLoadingSuspenseFallback forceFullPage />}>
       <Routes>
-        <Route path="/auth/*" element={<AuthContainer />} />
+        <Route element={<RequireAuth reverse />}>
+          <Route path="/auth/*" element={<AuthContainer />} />
+        </Route>
         <Route element={<RequireAuth />}>
           <Route path="/subscription/*" element={<SubscriptionContainer />} />
           <Route path="/*" element={<PanelContainer />} />

diff --git a/src/core/auth/RequireAuth.tsx b/src/core/auth/RequireAuth.tsx
@@ -2,12 +2,18 @@ import { Outlet, useLocation } from 'react-router-dom'
 import { useAbsoluteNavigate } from 'src/shared/absolute-navigate'
 import { useUserProfile } from './useUserProfile'
 
-export function RequireAuth() {
+interface RequireAuthProps {
+  reverse?: boolean
+}
+
+export function RequireAuth({ reverse }: RequireAuthProps) {
   const navigate = useAbsoluteNavigate()
   const location = useLocation()
   const user = useUserProfile()
 
-  if (!user.isAuthenticated && location.pathname !== '/auth/login') {
+  const isAuthenticated = !user.isAuthenticated && location.pathname !== '/auth/login'
+
+  if (isAuthenticated && !reverse) {
     window.setTimeout(() => {
       navigate(
         {
@@ -20,6 +26,11 @@ export function RequireAuth() {
       )
     })
     return null
+  } else if (reverse && !isAuthenticated) {
+    window.setTimeout(() => {
+      navigate(window.decodeURIComponent(location.search?.split('returnUrl=')[1]?.split('&')[0] ?? '/'), { replace: true })
+    })
+    return null
   }
 
   return <Outlet />