@vocollege/app 0.0.56 → 0.0.59

package/src/interceptor.ts

@@ -1,15 +1,26 @@
 import axios from "axios";
 import VoAuth from "./modules/VoAuth";
 import VoRouter from "./modules/VoRouter";
+// import VoApp from "./modules/VoApp";
+import { toast } from "react-toastify";
+
+// Custom.
+import I18n from "./modules/Services/I18n";
 
 (function () {
   let retry = 0;
 
   async function redirect() {
-    await VoAuth.logout();
-    VoRouter.redirectToLogout();
+    try {
+      await VoAuth.logout();
+      VoRouter.redirectToLogout();
+    } catch (error) {
+      console.error("Interceptor", error);
+    }
   }
+
   axios.defaults.withCredentials = true;
+  axios.defaults.headers.common["X-Requested-With"] = "XMLHttpRequest";
 
   axios.interceptors.request.use((req) => {
     // console.log('Interceptor request', `${req.method} ${req.url}`);
@@ -22,21 +33,21 @@ import VoRouter from "./modules/VoRouter";
     },
     async (error) => {
       const status = error.response ? error.response.status : null;
+
       if (status && retry < 2) {
         retry++;
         switch (status) {
           case 400:
           case 401:
-          case 403:
+            // case 403:
             try {
               await VoAuth.refreshToken();
               const token: any = VoAuth.getToken();
 
-              retry = 0;
-
               // Update the failed request with the new access token
-              // in order to remake the call.
+              // in order to redo the call.
               if (token) {
+                retry = 0;
                 error.config.headers["Authorization"] =
                   token.token_type + " " + token.access_token;
               }
@@ -48,12 +59,32 @@ import VoRouter from "./modules/VoRouter";
               // return Promise.reject(error);
             }
             break;
+          // case 419:
+          //   console.log("LOG OUT");
+          //   break;
         }
       }
 
-      redirect();
-      console.error("Interceptor", error);
+      // redirect();
+      // console.error("Interceptor", error);
       // return Promise.reject(error);
+      return new Promise((resolve, reject) => {
+        switch (status) {
+          // case 403:
+          //   reject(error);
+          //   break;
+          case 419:
+            toast.error(I18n.get.messages.sessionExpired);
+            setTimeout(() => {
+              redirect();
+            }, 5000);
+            break;
+          default:
+            reject(error);
+            break;
+        }
+        console.error("Interceptor", error);
+      });
     }
   );
 })();