fix:handle session not alive on frontend

metakgp · Jul 13, 2024 · 09c9c6a · 09c9c6a
1 parent bb96cbd
commit 09c9c6a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
@@ -12,6 +12,7 @@ const App: React.FC = () => {
     return (
         <>
             <main>
+                <Toaster position="bottom-center" />
                 <Circles />
                 <div id="wrapper">
                     <div className="wrapper-item">
@@ -27,7 +28,6 @@ const App: React.FC = () => {
                 </div>
             </main>
             {openModal && <Modal closeModal={setOpenModal} />}
-            <Toaster position="bottom-center" />
         </>
     );
 };

diff --git a/frontend/src/components/Electives.tsx b/frontend/src/components/Electives.tsx
@@ -5,7 +5,7 @@ import { useAppContext } from "../AppContext/AppContext";
 import Spinner from "./Spinner";
 
 const Electives: React.FC = () => {
-    const { user } = useAppContext();
+    const { user, logout } = useAppContext();
     const [isBreadthDownloading, setIsBreadthDownloading] = useState(false);
     const [isDepthDownloading, setIsDepthDownloading] = useState(false);
     const getElective = async (elective: string) => {
@@ -27,8 +27,13 @@ const Electives: React.FC = () => {
                 body: formData.toString(),
             });
 
+            const resData = await res.json();
+
             if (!res.ok) {
                 toast.error("Some Error Occured. Please Try Again.");
+                if (res.status == 401)
+                    if (resData.message == "Invalid Password" || resData.message == "Session isn't alive. PLease login again.")
+                        logout();
                 return;
             }
 

diff --git a/frontend/src/components/SecurityQueForm.tsx b/frontend/src/components/SecurityQueForm.tsx
@@ -61,7 +61,7 @@ const SecurityQueForm: React.FC = () => {
                     return;
                 }
                 if (res.status == 401)
-                    if (resData.message == "Invalid Password")
+                    if (resData.message == "Invalid Password" || resData.message == "Session isn't alive. PLease login again.")
                         return setAuth((prev) => ({ ...prev, currentStep: 0 }));
 
                 if (res.status == 500) throw new Error(resData.message);
@@ -112,7 +112,7 @@ const SecurityQueForm: React.FC = () => {
                     return;
                 }
                 if (res.status == 401)
-                    if (resData.message == "Invalid Password")
+                    if (resData.message == "Invalid Password" || resData.message == "Session isn't alive. PLease login again.")
                         return setAuth((prev) => ({ ...prev, currentStep: 0 }));
                 if (resData.message == "Invalid OTP")
                     return setAuth((prev) => ({ ...prev, currentStep: 1 }));