redirect to ticket url path after login (#140) (#173)

Redirects user to ticket url if they clicked on it without being logged in, after logging in --------- Co-authored-by: William Li <[email protected]>
WATonomous · Dec 21, 2023 · 904563a · 904563a
1 parent 411819a
commit 904563a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/frontend/src/components/Navbar.js b/frontend/src/components/Navbar.js
@@ -14,7 +14,6 @@ const Navbar = () => {
         setLoading(true)
         try {
             await login()
-            navigate('/')
         } catch (err) {
             setError('Failed to log in')
             console.log(err)

diff --git a/frontend/src/contexts/CustomRoutes.js b/frontend/src/contexts/CustomRoutes.js
@@ -1,12 +1,24 @@
 import React from 'react'
-import { Navigate, Outlet } from 'react-router-dom'
+import { Navigate, Outlet, useLocation } from 'react-router-dom'
 import { useAuth } from './AuthContext'
 
 export const PrivateRoute = () => {
     const { currentUser } = useAuth()
 
+    const location = useLocation()
+
     if (typeof currentUser === 'undefined') return <h1>Loading.....</h1>
-    if (!currentUser) return <Navigate replace to="/login" />
+    if (!currentUser)
+        return (
+            <Navigate
+                replace
+                to="/login"
+                state={{
+                    from:
+                        location.pathname != '/login' ? location.pathname : '/',
+                }}
+            />
+        )
     return <Outlet />
 }
 
@@ -16,6 +28,11 @@ export const PublicRoute = () => {
 
 export const LoggedInRedirect = () => {
     const { currentUser } = useAuth()
-    if (currentUser) return <Navigate replace to="/" />
+
+    const location = useLocation()
+
+    const prevLocation = location.state ? location.state['from'] : '/'
+
+    if (currentUser) return <Navigate replace to={prevLocation} />
     return <Outlet />
 }