Merge branch 'login-payload' of WrenchBoard/Users-Wrench into master

src/components/AuthPages/AuthRedirect/Redirect.jsx

@@ -43,7 +43,7 @@ function Redirect() {
             localStorage.setItem("member_id", `${res.data.member_id}`);
             localStorage.setItem("uid", `${res.data.uid}`);
             localStorage.setItem("session_token", `${res.data.session}`);
-            dispatch(updateUserDetails({...res.data, loggedIn:true}));
+            dispatch(updateUserDetails({...res.data}));
             navigate('/', {replace: true})
             return
           }

src/components/AuthPages/Login/index.jsx

@@ -77,6 +77,14 @@ export default function Login() {
       return;
     }
 
+    //checks if email is a valid email address
+    let regEx = /^[^0-9][a-zA-Z0-9._%+-]+@[a-zA-Z]+(\.[a-zA-Z]+)+$/;
+    if (regEx.test(email) == false) {
+      setLoginLoading(false);
+      setMsgError("Invalid Email");
+      return setTimeout(()=>{setMsgError("");},3000)
+    }
+
     if (name == "full") {
       // Post Data Info for normal Login
       postData = {
@@ -116,7 +124,7 @@ export default function Login() {
         localStorage.setItem("uid", `${res.data.uid}`);
         localStorage.setItem("session_token", `${res.data.session}`);
         // localStorage.setItem("session", `${res.data.session}`);
-        dispatch(updateUserDetails({...res.data, loggedIn:true}));
+        dispatch(updateUserDetails({...res.data}));
         setTimeout(() => {
           navigate("/", { replace: true });
           setLoginLoading(false);

src/middleware/AuthRoute.jsx

@@ -18,7 +18,9 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
 
   const { jobListTable } = useSelector((state) => state.tableReload);
 
-  const { userDetails:{loggedIn} } = useSelector((state) => state?.userDetails); // CHECKS IF LOGGEDIN IS TRUE
+  const { userDetails:{username, uid} } = useSelector((state) => state?.userDetails); // CHECKS IF USER Details are avaliable, to determine if user is active
+
+  let loggedIn = username && uid ? true : false // variable to determine if user is logged in
 
   useEffect(() => {
     //Removing Data stored at localStorage after session expires