wrappid · PritamIT2023 · Jun 27, 2024 · Jun 27, 2024
diff --git a/package/components/inputs/forms/CoreForm.js b/package/components/inputs/forms/CoreForm.js
@@ -81,9 +81,9 @@ class CoreForm extends Component {
       let rawFormStatus = this.props.rawFormStatus;
 
       // eslint-disable-next-line id-length
-      let formOb = await getForm(this.props.formId, this.props.authenticated, {
+      let formOb = await this.props.GetForm(this.props.formId, this.props.authenticated, {
         rawForm,
-        rawFormStatus,
+        rawFormStatus
       });
 
       formJson = formOb.formJson;
@@ -706,7 +706,7 @@ class CoreForm extends Component {
         let rawForm = this.props.rawFormSchema;
         let rawFormStatus = this.props.rawFormStatus;
         // eslint-disable-next-line id-length
-        let t = await getForm(this.props.formId, this.props.authenticated, {
+        let t = await this.props.GetForm(this.props.formId, this.props.authenticated, {
           rawForm,
           rawFormStatus,
         });
@@ -1199,6 +1199,16 @@ const mapDispatchToProps = dispatch => {
     FormReset: data => {
       dispatch(resetFormReducer(data));
     },
+    GetForm: (formId, authenticated, {
+      rawForm,
+      rawFormStatus
+    }) => {
+      return getForm(formId, authenticated, {
+        rawForm,
+        rawFormStatus
+      },
+      dispatch);
+    },
     HandleFormSubmit: (
       method,
       endpoint,

diff --git a/package/components/layouts/_system/AppContainerLayout.js b/package/components/layouts/_system/AppContainerLayout.js
@@ -19,10 +19,7 @@ import { apiRequestAction } from "../../../store/action/appActions";
 import { toggleLeftMenuState } from "../../../store/action/menuAction";
 import { GET_ROLE_PERMISSION_ERROR, GET_ROLE_PERMISSION_SUCCESS } from "../../../store/types/authTypes";
 import { BUILD_MENU_ROLE_PERMISSIONS } from "../../../store/types/menuTypes";
-import {
-  RECALL_TOKEN_REJUVINDATED,
-  REMOVE_PENDING_REQUESTS
-} from "../../../store/types/pendingRequestTypes";
+import { REMOVE_PENDING_REQUESTS } from "../../../store/types/pendingRequestTypes";
 import { SELECT_OPTION_SUCCESS } from "../../../store/types/selectOptionsTypes";
 import {
   GET_SETTING_META_ERROR,
@@ -45,7 +42,7 @@ export default function AppContainerLayout() {
   // eslint-disable-next-line etc/no-commented-out-code
   const { leftMenuOpen } = useSelector((state) => state?.menu);
   const { routes: _routes } = useSelector((state) => state?.route);
-  const { recall: recallState, pendingRequest: currentPendingRequest } = useSelector((state) => state?.pendingRequests);
+  const { recall: recallState, requests: allPendingReq } = useSelector((state) => state?.pendingRequests);
   const { uid, accessToken } = useSelector((state) => state?.auth || {});
 
   const [leftMenuOpenSmallScreen, setLeftDrawerSmallScreen] = React.useState(false);
@@ -120,29 +117,32 @@ export default function AppContainerLayout() {
   };
 
   React.useEffect(() => {
-    if (currentPendingRequest && recallState === RECALL_TOKEN_REJUVINDATED) {
-      dispatch(
-        apiRequestAction(
-          currentPendingRequest.method,
-          currentPendingRequest.endpoint,
-          currentPendingRequest.authRequired,
-          currentPendingRequest.data,
-          currentPendingRequest.successType,
-          currentPendingRequest.errorType,
-          currentPendingRequest.localAction,
-          currentPendingRequest.includeFile,
-          currentPendingRequest.file,
-          currentPendingRequest.formId,
-          currentPendingRequest.reload,
-          currentPendingRequest.reduxData,
-          currentPendingRequest.pushSnack,
-          currentPendingRequest.loadingType,
-          currentPendingRequest.resetLoadingType
-        )
-      );
+    if (allPendingReq?.length > 0 && recallState === "rejuvinated") {
+      allPendingReq.forEach(currentPendingRequest => {
+        dispatch(
+          apiRequestAction(
+            currentPendingRequest.method,
+            currentPendingRequest.endpoint,
+            currentPendingRequest.authRequired,
+            currentPendingRequest.data,
+            currentPendingRequest.successType,
+            currentPendingRequest.errorType,
+            currentPendingRequest.localAction,
+            currentPendingRequest.includeFile,
+            currentPendingRequest.file,
+            currentPendingRequest.formId,
+            currentPendingRequest.reload,
+            currentPendingRequest.reduxData,
+            currentPendingRequest.pushSnack,
+            currentPendingRequest.loadingType,
+            currentPendingRequest.resetLoadingType
+          )
+        );
+      });
       dispatch({ type: REMOVE_PENDING_REQUESTS });
     }
-  });
+
+  }, [accessToken]);
 
   React.useEffect(() => {
     let components =

diff --git a/package/layout/PageContainer.js b/package/layout/PageContainer.js
@@ -147,7 +147,7 @@ export default function PageContainer(props) {
   };
 
   return sessionExpired && !uid && route?.authRequired ? (
-    <CoreDomNavigate to="/" replace={true} />
+    <CoreDomNavigate to="checkUserExist" replace={true} />
   ) : (
     <>
       {/* <CoreThemeProvider themeID={pageTheme()}> */}

diff --git a/package/middleware/axiosInterceptor.js b/package/middleware/axiosInterceptor.js
@@ -1,3 +1,6 @@
+// eslint-disable-next-line import/namespace
+import { reloadToken } from "../utils/appUtils";
+
 async function tempFetch(apiConfig) {
   // -- console.log("API CALLL", apiConfig);
   try {
@@ -51,7 +54,9 @@ async function tempFetch(apiConfig) {
     }
   } catch (error) {
     // eslint-disable-next-line no-console
-    console.error(error);
+    if(error?.response?.status === 401 || error?.response?.status === 403){
+      reloadToken(apiConfig?.dispatch);
+    }
     throw error;
   }
 

diff --git a/package/service/AppService.js b/package/service/AppService.js
@@ -14,7 +14,8 @@ class AppService {
     authRequired,
     data,
     includeFile = false,
-    file = null
+    file = null,
+    dispatch = null
   ) {
     try {
       let response = await axiosInterceptor({
@@ -24,10 +25,11 @@ class AppService {
               ? createFormData(file, data)
               : JSON.stringify(data)
             : null,
+        dispatch   : dispatch,
         externalApi: await this.isUrl(endpoint),
         headers    : await authHeader(authRequired, includeFile),
         method     : method.toUpperCase(),
-        url        : await this.getEndpoint(method, endpoint, data),
+        url        : await this.getEndpoint(method, endpoint, data)
       });
 
       // -- console.log("API Endpoint = " + endpoint);

diff --git a/package/store/action/appActions.js b/package/store/action/appActions.js
@@ -5,15 +5,8 @@ import {
   LOGIN_WITH_URL_API
 } from "../../config/api";
 import { HTTP, MESSAGE_TYPE } from "../../config/constants";
-import {
-  globalAccessToken,
-  globalRefreshToken,
-  globalTokenRequested,
-  globalTokenRequestTimeStamp
-} from "../../CoreRoutes";
 import { formStore } from "../../layout/PageContainer";
 import AppService from "../../service/AppService";
-import { reloadToken } from "../../utils/appUtils";
 import { getForm } from "../../utils/formUtils";
 import {
   CLEAR_SNACK_MESSAGE,
@@ -79,7 +72,8 @@ export const apiRequestAction =
           authRequired,
           data,
           includeFile,
-          file
+          file,
+          dispatch
         )
           .then(async response => {
             let formJson = null;
@@ -231,13 +225,6 @@ export const apiRequestAction =
             endpoint !== LOGIN_WITH_URL_API &&
             endpoint !== LOGIN_WITH_RESET_PASSWORD_API
             ) {
-              reloadToken(
-                globalRefreshToken,
-                globalAccessToken,
-                globalTokenRequested,
-                globalTokenRequestTimeStamp,
-                dispatch
-              );
               dispatch({
                 payload: {
                   authRequired,

diff --git a/package/utils/appUtils.js b/package/utils/appUtils.js
@@ -4,6 +4,7 @@ import moment from "moment";
 
 import { REFRESH_TOKEN_API } from "../config/api";
 import { HTTP } from "../config/constants";
+import { globalAccessToken, globalRefreshToken, globalTokenRequestTimeStamp, globalTokenRequested } from "../CoreRoutes";
 import {
   LOGOUT_SUCCESS,
   SESSION_EXPIRED,
@@ -37,23 +38,24 @@ export const getTimestamp = () => {
 };
 
 export async function reloadToken(
-  refreshToken,
-  accessToken,
-  tokenRequested,
-  tokenRequestTimeStamp,
+  // eslint-disable-next-line etc/no-commented-out-code
+  // refreshToken,
+  // accessToken,
+  // tokenRequested,
+  // tokenRequestTimeStamp,
   dispatch
 ) {
-  let diff = moment().diff(tokenRequestTimeStamp, "seconds");
+  let diff = moment().diff(globalTokenRequestTimeStamp, "seconds");
 
   // -- console.log("__tokenRequested__", tokenRequested, diff);
-  if (!tokenRequested || diff > 60) {
+  if (!globalTokenRequested || diff > 60) {
     const backendUrl = WrappidData?.config?.backendUrl;
 
     dispatch({ type: TOKEN_REQUESTED });
     fetch(backendUrl + REFRESH_TOKEN_API, {
-      body   : JSON.stringify({ refreshToken }),
+      body   : JSON.stringify({ refreshToken: globalRefreshToken }),
       headers: {
-        Authorization : "Bearer " + accessToken,
+        Authorization : "Bearer " + globalAccessToken,
         "Content-Type": "application/json",
       },
       method: HTTP.POST,

diff --git a/package/utils/formUtils.js b/package/utils/formUtils.js
@@ -31,6 +31,7 @@ import {
   UPDATE_DATA_ERROR,
   UPDATE_DATA_SUCCESS
 } from "../store/types/dataManagementTypes";
+import { SET_PENDING_REQUESTS } from "../store/types/pendingRequestTypes";
 import CoreClasses from "../styles/CoreClasses";
 
 export function getFormikRequiredMessage(name = "", isShort = false) {
@@ -717,7 +718,7 @@ export function hookcallCheck(
   }
 }
 
-export async function getForm(formId, auth = true, formReducer) {
+export async function getForm(formId, auth = true, formReducer, dispatch) {
   let { config: configuration } = WrappidData;
 
   if (formReducer?.rawForm && formReducer?.rawForm[formId]) {
@@ -764,7 +765,22 @@ export async function getForm(formId, auth = true, formReducer) {
         };
       }
     } catch (err) {
-      // eslint-disable-next-line no-console
+      let url = auth ? GET_FORM_API_AUTHENTICATED : GET_FORM_API;
+
+      if(err.status === 401 || err.status === 403){
+        dispatch({
+          payload: {
+            authRequired: auth,
+            endpoint    : url + formId,
+            formId      : formId,
+            includeFile : false,
+            localAction : false,
+            method      : HTTP.GET,
+            reload      : false, // need review
+          },
+          type: SET_PENDING_REQUESTS,
+        });
+      } // eslint-disable-next-line no-console
       console.error("Error in form fetch");
       return {
         formId,