diff --git a/src/components/AuthPages/Login/index.jsx b/src/components/AuthPages/Login/index.jsx index e84c207..2498101 100644 --- a/src/components/AuthPages/Login/index.jsx +++ b/src/components/AuthPages/Login/index.jsx @@ -17,6 +17,10 @@ import { updateUserDetails } from "../../../store/UserDetails"; import ReCAPTCHA from "react-google-recaptcha"; export default function Login() { + + const queryParams = new URLSearchParams(location?.search); + const sessionExpired = queryParams.get("sessionExpired") + const dispatch = useDispatch(); const { state } = useLocation(); @@ -255,6 +259,13 @@ export default function Login() { + + {/* SHOWS THIS IF USER SESSION HAS EXPIRED */} + {sessionExpired == 'true' && +
+

Your session expired and will need to login again

+
+ } {/* switch login component */}
diff --git a/src/components/FamilyAcc/index.jsx b/src/components/FamilyAcc/index.jsx index c398e13..9c73585 100644 --- a/src/components/FamilyAcc/index.jsx +++ b/src/components/FamilyAcc/index.jsx @@ -5,7 +5,7 @@ import React, { useMemo, useState, } from "react"; -import SiteService from "../../services/SiteService"; +import usersService from "../../services/UsersService"; import InputCom from "../Helpers/Inputs/InputCom"; import ModalCom from "../Helpers/ModalCom"; import Layout from "../Partials/Layout"; @@ -27,7 +27,7 @@ export default function FamilyAcc() { last_name: "", }); - const apiCall = useMemo(() => new SiteService(), []); + const apiCall = useMemo(() => new usersService(), []); const popUpHandler = () => { setPopUp((prev) => !prev); diff --git a/src/components/jobPopout/JobListPopout.jsx b/src/components/jobPopout/JobListPopout.jsx index dd00adb..6fed709 100644 --- a/src/components/jobPopout/JobListPopout.jsx +++ b/src/components/jobPopout/JobListPopout.jsx @@ -1,7 +1,7 @@ import { Field, Form, Formik } from "formik"; import React, { useCallback, useEffect, useMemo, useState } from "react"; import * as Yup from "yup"; -import SiteService from "../../services/SiteService"; +import usersService from "../../services/UsersService"; import InputCom from "../Helpers/Inputs/InputCom/index"; import ModalCom from "../Helpers/ModalCom"; import LoadingSpinner from "../Spinners/LoadingSpinner"; @@ -36,7 +36,7 @@ const dispatch = useDispatch() }, }); - const apiCall = useMemo(() => new SiteService(), []); + const apiCall = useMemo(() => new usersService(), []); // member listing const memberList = useCallback(async () => { diff --git a/src/services/UsersService.js b/src/services/UsersService.js index bb38a78..d3316e8 100644 --- a/src/services/UsersService.js +++ b/src/services/UsersService.js @@ -1237,6 +1237,10 @@ class usersService { console.log(response); // res = response; console.log("~~~~~~~ Toks2 POST ~~~~~~~~"); + if(response.data.internal_return == '-9999'){ + localStorage.clear() + window.location.href=`/login?sessionExpired=true` + } return response; }) .catch((error) => {