google login fix

src/components/AuthPages/AuthRedirect/Redirect.jsx

@@ -16,7 +16,7 @@ function Redirect() {
 
     useEffect(()=>{
       if(!codeResponse){
-            navigate('/login', {replace: true})
+        navigate('/login', {state: {error: true}})
         return
       }
       console.log(codeResponse);
@@ -39,20 +39,18 @@ function Redirect() {
       userApi
         .authStart(reqData)
         .then((res) => {
-            if (res.status != 200) {
+          if (res.status == 200  && res.data.internal_return >= 0 && res.data.member_id && res.data.uid && res.data.session) {
-              navigate('/login', {replace: true})
-              return;
-            }
-
             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}));
             navigate('/', {replace: true})
-
+            return
+          }
+          navigate('/login', {state: {error: true}})
         })
         .catch((error) => {
-            navigate('/login', {replace: true})
+          navigate('/login', {state: {error: true}})
           console.log(error);
         });
     },[])

src/components/AuthPages/Login/index.jsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useLayoutEffect, useState } from "react";
-import { Link, useNavigate } from "react-router-dom";
+import { Link, useNavigate, useLocation } from "react-router-dom";
 import linkedInLogo from "../../../assets/images/Linkedin.png";
 import appleLogo from "../../../assets/images/apple-black.svg";
 import facebookLogo from "../../../assets/images/facebook-4.svg";
@@ -16,6 +16,7 @@ import { updateUserDetails } from "../../../store/UserDetails";
 
 export default function Login() {
   const dispatch = useDispatch();
+  const {state} = useLocation()
 
   let [loginType, setLoginType] = useState('');
 
@@ -105,7 +106,7 @@ export default function Login() {
     userApi
       .logInUser(postData)
       .then((res) => {
-        if (res.status != 200 || res.data.internal_return < 0) {
+        if (res.status != 200 || res.data.internal_return < 0 || !res.data.member_id || !res.data.uid || !res.data.session) {
           // setMsgError("Wrong, email/password");
           setLoginError(true);
           setLoginLoading(false);
@@ -175,6 +176,14 @@ export default function Login() {
     }
     let loginValue = readCookie('loginType')
     setLoginType(loginValue)
+
+    if(state?.error){ //check if the login path has an error state indicating any social handle login with error
+      setMsgError("Unexpected Error, Please try again soon.");
+      setTimeout(()=>{
+        setMsgError("");
+        navigate('/login', {replace: true})
+      },4000)
+    }
   },[])