Save path state after login (#231)

* Fix redirect issue in AuthProvider * Add correct logic for redirecting * use sessionStorage instead * Format --------- Co-authored-by: Jason Zheng <jasonz4200@gmail.com>
cornellh4i · Apr 16, 2024 · 966e6c8 · 966e6c8
1 parent 8e98917
commit 966e6c8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/frontend/src/components/organisms/LoginForm.tsx b/frontend/src/components/organisms/LoginForm.tsx
@@ -78,13 +78,6 @@ const LoginForm = () => {
     await signInWithEmailAndPassword(email, password);
   };
 
-  /** Handles login success */
-  useEffect(() => {
-    if (signedInUser?.user.emailVerified) {
-      router.push("/events/view");
-    }
-  }, [signedInUser]);
-
   /** Handles login errors */
   const [errorMessage, setErrorMessage] = useState("");
   useEffect(() => {

diff --git a/frontend/src/components/organisms/ViewEvents.tsx b/frontend/src/components/organisms/ViewEvents.tsx
@@ -89,8 +89,6 @@ const UpcomingEvents = () => {
   /** Error screen */
   if (isError) return <FetchDataError />;
 
-  console.log(upcomingEventsSupervisor);
-
   return (
     <div>
       {(role === "Supervisor" || role === "Admin") && (

diff --git a/frontend/src/utils/AuthContext.tsx b/frontend/src/utils/AuthContext.tsx
@@ -159,7 +159,7 @@ export const AuthProvider = ({ children }: AuthProviderProps) => {
         /^\/events\/[a-zA-Z0-9_-]+\/(attendees|edit)|\/events\/create$/;
 
       const regexMatcherforAdminPaths =
-        /^\/users\/([a-zA-Z0-9_-]+)\/(manage|view)$/
+        /^\/users\/([a-zA-Z0-9_-]+)\/(manage|view)$/;
       // check auth state
       if (user) {
         const { claims } = await user.getIdTokenResult();
@@ -172,9 +172,17 @@ export const AuthProvider = ({ children }: AuthProviderProps) => {
       }
 
       if (!user && !publicPaths.includes(path) && !isResetPage(path)) {
+        sessionStorage.setItem("redirectPath", path);
         router.replace("/login");
       } else if (user && user.emailVerified && authPaths.includes(path)) {
-        router.replace("/events/view");
+        const redirectPath = sessionStorage.getItem("redirectPath");
+        if (redirectPath) {
+          router
+            .replace(redirectPath)
+            .then(() => sessionStorage.removeItem("redirectPath"));
+        } else {
+          router.replace("/events/view");
+        }
       } else if (
         user &&
         user.emailVerified &&