Bug fix

src/pages/GoogleAuthCallback/GoogleAuthCallback.js

@@ -28,7 +28,6 @@ function GoogleAuthCallback({ history }) {
     axios({
       method: "GET",
       url: `http://localhost:1337/api/auth/google/callback?${search}`,
-      withCredentials: true,
     }).then((res) => {
       if (res.data?.jwt) {
         const user = res.data?.user;

src/request/index.js

@@ -6,7 +6,7 @@ const request = axios.create({
   headers: {
     "Content-Type": "application/json",
   },
-  withCredentials: true,
+  //withCredentials: true,
   // paramsSerializer: (params) =>
   //   queryString.stringify(params, { arrayFormat: 'comma' }),
 });

src/store/index.js

@@ -6,7 +6,7 @@ import loadingMiddleware from "./middleware/loadingMiddleware";
 import requestStatusMiddleware from "./middleware/requestStatusMiddleware";
 import internalServerErrorMiddleware from "./middleware/internalServerErrorMiddleware";
 import accessTokenMiddleware from "./middleware/accessTokenMiddleware";
-import authenticationMiddleware from "./middleware/authenticationMiddleware";
+// import authenticationMiddleware from "./middleware/authenticationMiddleware";
 
 const composeEnhancers =
   (window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ &&
@@ -25,7 +25,7 @@ export default createStore(
       requestStatusMiddleware,
       internalServerErrorMiddleware,
       accessTokenMiddleware,
-      authenticationMiddleware
+      //authenticationMiddleware
     )
   )
 );

src/store/middleware/accessTokenMiddleware.js

@@ -34,15 +34,14 @@ export default ({ dispatch }) =>
             refreshToken: refresh,
           },
           {
-            withCredentials: true,
             headers: { Authorization: `Bearer ${jwtToken}` },
           }
         );
-        const newToken = axiosResponse.data.jwt;
+        const newTokens = axiosResponse.data;
 
-        response.headers.Authorization = `Bearer ${newToken}`;
+        response.headers.Authorization = `Bearer ${newTokens.jwt}`;
 
-        dispatch(refreshUserToken(newToken));
+        dispatch(refreshUserToken(newTokens));
       }
 
       return Promise.resolve(response);

src/store/middleware/requestStatusMiddleware.js

@@ -14,9 +14,7 @@ export default ({ dispatch }) =>
       }
       if (
         error.response.config.url !== apiEndpoints.authentications.login &&
-        error.response.config.url !==
-          apiEndpoints.authentications.confirmSecurityQuestion &&
-        error.response.status === 4003
+        error.response.status === 401
       ) {
         return dispatch(logoutUser());
       }

src/store/saga/loginSaga.js

@@ -45,11 +45,10 @@ function* fetchUser({ payload }) {
       yield call(payload.handleApiResponseSuccess);
     }
   } catch (e) {
-    // if (e.response && e.response.data) {
-    //   const errorMessage = yield call(rejectErrorCodeHelper, e);
-    //   yield put(fetchUserError(errorMessage));
-    // }
-    yield put(fetchUserError('Email or password incorrect!'));
+    if (e.response && e.response.data) {
+      const errorMessage = yield call(rejectErrorCodeHelper, e);
+      yield put(fetchUserError(errorMessage));
+    }
   }
 }
 function* authenticateUser() {
@@ -93,12 +92,13 @@ function* logoutUser() {
 
 export function* refreshToken({ payload }) {
   try {
-    const newTokenDecoded = jwt.decode(payload);
+    const newTokenDecoded = jwt.decode(payload.jwt);
 
-    yield call(authScopeSetHelper, JWT_TOKEN, payload);
-    addHeaderToken(payload);
+    yield call(authScopeSetHelper, JWT_TOKEN, payload.jwt);
+    yield call(authScopeSetHelper, JWT_REFRESH_TOKEN, payload.refreshToken);
+    addHeaderToken(payload.jwt);
     yield put(setUser(newTokenDecoded));
-    yield put(updateUserToken(payload));
+    yield put(updateUserToken(payload.jwt));
     return true;
   } catch (error) {
     console.log(error); // eslint-disable-line

src/store/saga/registerSaga.js

@@ -7,7 +7,7 @@ import {
 } from "../actions/register/registerActions";
 import { JWT_TOKEN } from "../../constants/localStorage";
 import { authScopeSetHelper } from "../../util/helpers/authScopeHelpers";
-// import { rejectErrorCodeHelper } from "../../util/helpers/rejectErrorCodeHelper";
+import { rejectErrorCodeHelper } from "../../util/helpers/rejectErrorCodeHelper";
 
 function* registerUser({ payload }) {
   try {
@@ -20,11 +20,10 @@ function* registerUser({ payload }) {
       yield call(payload.handleApiResponseSuccess);
     }
   } catch (e) {
-    // if (e.response && e.response.data) {
-    //   const errorMessage = yield call(rejectErrorCodeHelper, e);
-    //   yield put(registerUserError(errorMessage));
-    // }
-    yield put(registerUserError('Email or username already taken!'));
+    if (e.response && e.response.data) {
+      const errorMessage = yield call(rejectErrorCodeHelper, e);
+      yield put(registerUserError(errorMessage));
+    }
   }
 }
 

src/util/helpers/rejectErrorCodeHelper.js

@@ -1,14 +1,7 @@
-import i18next from 'i18next';
-
 export const rejectErrorCodeHelper = (error) => {
-  if (error?.response?.data?.Errors) {
-    const errorCode = error?.response?.data?.Errors[0]?.Code;
-    const errorMessage = errorCode
-      ? i18next.t(`apiErrors.${errorCode}`)
-      : i18next.t('apiErrors.SomethingWentWrong');
+  if (error?.response?.data?.error) {
+    const errorMessage = error?.response?.data?.error.message;
 
     return errorMessage;
   }
-
-  return i18next.t('apiErrors.SomethingWentWrong');
 };