Improve login/logout logic

context/Auth/AuthContext.tsx

@@ -124,21 +124,21 @@ export function AuthProvider({ children }) {
       .then(({ jwt }) => {
         localStorage.setItem(TOKEN_KEY_NAME, jwt);
         API.defaults.headers.common["Authorization"] = `Bearer ${jwt}`;
-        api.getCurrentUser().then((response) => {
-          setUser(response);
-          switch (response.type) {
-            case USER.ROLES.ATTENDEE:
-              router.push("/attendee/profile");
-              break;
-            case USER.ROLES.SPONSOR:
-              router.push("/sponsor/scanner");
-              break;
-            case USER.ROLES.STAFF:
-              router.push("/staff/badges");
-              break;
-            default:
-              throw new Error(`Unknown USER TYPE: ${response.type}`);
+        api.getCurrentUser().then(async (response) => {
+          if (router.query.from == undefined) {
+            switch (response.type) {
+              case USER.ROLES.ATTENDEE:
+                await router.push({ query: { from: "/attendee/profile" } });
+                break;
+              case USER.ROLES.SPONSOR:
+                await router.push({ query: { from: "/sponsor/scanner" } });
+                break;
+              case USER.ROLES.STAFF:
+                await router.push({ query: { from: "/staff/badges" } });
+                break;
+            }
           }
+          setUser(response);
         });
       })
       .catch((errors) => {
@@ -148,11 +148,11 @@ export function AuthProvider({ children }) {
           setErrors("Request denied by the server");
         } else if (errors.request) {
           setErrors(
-            "No connection to the server. Please check your internet connection and try again later",
+            "No connection to the server. Please check your internet connection and try again later"
           );
         } else {
           setErrors(
-            "Something went wrong :/ Please check your internet connection and try again later",
+            "Something went wrong :/ Please check your internet connection and try again later"
           );
         }
         setUser(undefined);
@@ -164,8 +164,7 @@ export function AuthProvider({ children }) {
     setLoading(true);
     localStorage.clear();
     delete API.defaults.headers.common["Authorization"];
-    setUser(undefined);
-    router.push("/");
+    router.push("/").finally(() => setUser(undefined));
   }
 
   function editUser(nickname) {
@@ -179,7 +178,7 @@ export function AuthProvider({ children }) {
       .catch((errors) => {
         setUser(undefined);
         setErrors(
-          "Something went wrong :/ Please check your internet connection and try again later",
+          "Something went wrong :/ Please check your internet connection and try again later"
         );
       });
   }

context/Auth/withAuth.js

@@ -9,7 +9,7 @@ export function withAuth(WrappedComponent) {
     const { user } = useAuth();
 
     if (!user) {
-      router.replace("/signup");
+      router.replace(`/login?from=${encodeURIComponent(router.asPath)}`);
       return null;
     }
 
@@ -29,7 +29,8 @@ export function withAuth(WrappedComponent) {
             "/product/[slug]",
           ].includes(router.pathname)
         ) {
-          return router.replace("/404");
+          router.replace("/404");
+          return null;
         }
         break;
       case USER.ROLES.STAFF:
@@ -43,7 +44,8 @@ export function withAuth(WrappedComponent) {
             "/attendees/[uuid]",
           ].includes(router.pathname)
         ) {
-          return router.replace("/404");
+          router.replace("/404");
+          return null;
         }
         break;
       case USER.ROLES.SPONSOR:
@@ -55,7 +57,8 @@ export function withAuth(WrappedComponent) {
             "/sponsor/visitors",
           ].includes(router.pathname)
         ) {
-          return router.replace("/404");
+          router.replace("/404");
+          return null;
         }
         break;
     }

context/Auth/withoutAuth.js

@@ -8,8 +8,11 @@ export function withoutAuth(WrappedComponent) {
     const router = useRouter();
     const { user } = useAuth();
 
-    if (user && router.pathname == "/login") {
-      router.replace("/");
+    if (user) {
+      router.replace(
+        (router.query.from && decodeURIComponent(router.query.from)) ?? "/"
+      );
+      return null;
     }
     return <WrappedComponent {...props} />;
   };

layout/Challenges/Challenges.tsx

@@ -18,4 +18,4 @@ function Index() {
   );
 }
 
-export default withoutAuth(Index);
+export default Index;

layout/FAQs/FAQs.tsx

@@ -35,4 +35,4 @@ function Faq() {
   );
 }
 
-export default withoutAuth(Faq);
+export default Faq;

layout/ForgotPassword/ForgotPassword.tsx

@@ -32,4 +32,4 @@ function ForgotPassword() {
   );
 }
 
-export default withoutAuth(ForgotPassword);
+export default ForgotPassword;

layout/Hackathon/Hackathon.tsx

@@ -82,4 +82,4 @@ function Index() {
   );
 }
 
-export default withoutAuth(Index);
+export default Index;

layout/Home/Home.tsx

@@ -19,4 +19,4 @@ function Home() {
   );
 }
 
-export default withoutAuth(Home);
+export default Home;

layout/ResetPassword/ResetPassword.tsx

@@ -43,4 +43,4 @@ function Reset() {
   );
 }
 
-export default withoutAuth(Reset);
+export default Reset;

layout/Schedule/Schedule.tsx

@@ -18,4 +18,4 @@ function Index() {
   );
 }
 
-export default withoutAuth(Index);
+export default Index;

layout/SignUp/SignUp.tsx

@@ -33,4 +33,4 @@ function Signup() {
   );
 }
 
-export default withoutAuth(Signup);
+export default Signup;

layout/Speakers/Speakers.tsx

@@ -22,4 +22,4 @@ function Speakers() {
   );
 }
 
-export default withoutAuth(Speakers);
+export default Speakers;

layout/Team/Team.tsx

@@ -16,4 +16,4 @@ function Index() {
   );
 }
 
-export default withoutAuth(Index);
+export default Index;

pages/register/[uuid].js

@@ -116,4 +116,4 @@ function Register() {
   );
 }
 
-export default withoutAuth(Register);
+export default Register;