@banch0u/core-project-test-repository 2.2.3 → 2.2.4

package/dist/utils/axios.js

@@ -1,71 +1,5 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-// import axios from "axios";
-// export const ACCESS_TOKEN_KEY = "token";
-// export const REFRESH_TOKEN_KEY = "refreshToken";
-
-// // Base Axios instance
-// const api = axios.create({ baseURL: process.env.REACT_APP_BASE_URL });
-
-// // Function to refresh token
-// const refreshAccessToken = async () => {
-//   try {
-//     const refreshToken = localStorage.getItem(REFRESH_TOKEN_KEY); // Adjust storage as needed
-//     const response = await api.post(
-//       `/profile/refresh-token`,
-//       {},
-//       {
-//         headers: {
-//           RefreshToken: `${refreshToken}`, // Send refresh token as a header
-//         },
-//       }
-//     );
-//     localStorage.setItem(ACCESS_TOKEN_KEY, response.data.accessToken);
-//     return response.data.accessToken;
-//   } catch (error) {
-//     console.error("Failed to refresh token:", error);
-//     throw error; // Handle logout or token expiration
-//   }
-// };
-
-// // Add Axios request interceptor
-// api.interceptors.request.use(
-//   (config) => {
-//     const token = localStorage.getItem(ACCESS_TOKEN_KEY); // Get token from storage
-//     if (token) {
-//       config.headers.Authorization = `Bearer ${token}`;
-//     }
-//     console.log(config);
-//     return config;
-//   },
-//   (error) => Promise.reject(error)
-// );
-
-// // Add Axios response interceptor
-// api.interceptors.response.use(
-//   (response) => response, // Pass through successful responses
-//   async (error) => {
-//     const originalRequest = error.config;
-//     if (error.code === "ERR_NETWORK" && !originalRequest._retry) {
-//       originalRequest._retry = true; // Prevent infinite retry loops
-//       try {
-//         const newAccessToken = await refreshAccessToken();
-//         originalRequest.headers.Authorization = `Bearer ${newAccessToken}`;
-//         return api(originalRequest); // Retry the failed request with the new token
-//       } catch (refreshError) {
-//         // Handle failed token refresh logic (e.g., logout user)
-//         console.error("Token refresh failed:", refreshError);
-//         window.location.href = "/docflow/login"; //Comment this to prevent logout
-//         return Promise.reject(refreshError);
-//       }
-//     }
-//     return Promise.reject(error); // Reject all other errors
-//   }
-// );
-
-// export default api;
-
-//DEV OPTION
 import axios from "axios";
 export var ACCESS_TOKEN_KEY = "token";
 export var REFRESH_TOKEN_KEY = "refreshToken";
@@ -75,100 +9,52 @@ if (window.location.hostname === "localhost") {
 } else {
   baseUrl = window.location.origin + "/api";
 }
-// Base Axios instance
 var api = axios.create({
   baseURL: baseUrl
 });
-
-// Function to refresh token
-var refreshAccessToken = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-    var refreshToken, response;
-    return _regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          _context.prev = 0;
-          refreshToken = localStorage.getItem("refreshToken"); // Adjust storage as needed
-          _context.next = 4;
-          return axios.post(baseUrl + "/profile/refresh-token", {}, {
-            headers: {
-              RefreshToken: "".concat(refreshToken) // Send refresh token as a header
-            }
-          });
-        case 4:
-          response = _context.sent;
-          localStorage.setItem(ACCESS_TOKEN_KEY, response.data.accessToken);
-          return _context.abrupt("return", response.data.accessToken);
-        case 9:
-          _context.prev = 9;
-          _context.t0 = _context["catch"](0);
-          console.error("Failed to refresh token:", _context.t0);
-          throw _context.t0;
-        case 13:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee, null, [[0, 9]]);
-  }));
-  return function refreshAccessToken() {
-    return _ref.apply(this, arguments);
-  };
-}();
-
-// Add Axios request interceptor
 api.interceptors.request.use(function (config) {
-  var token = localStorage.getItem(ACCESS_TOKEN_KEY); // Get token from storage
-  if (token) {
-    config.headers.Authorization = "Bearer ".concat(token);
-  }
+  var token = localStorage.getItem(ACCESS_TOKEN_KEY);
+  if (token) config.headers.Authorization = "Bearer ".concat(token);
   return config;
 }, function (error) {
   return Promise.reject(error);
 });
-
-// Add Axios response interceptor
 api.interceptors.response.use(function (response) {
   return response;
-},
-/*#__PURE__*/
-// Pass through successful responses
-function () {
-  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(error) {
-    var originalRequest, newAccessToken, basePath, redirectPath;
-    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
+}, /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(error) {
+    var originalRequest, basePath, redirectPath;
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
         case 0:
-          originalRequest = error.config;
-          if (!(error.response.status === 401 && !originalRequest._retry)) {
-            _context2.next = 18;
+          originalRequest = error.config; // if no response (network error etc.)
+          if (error.response) {
+            _context.next = 3;
             break;
           }
-          originalRequest._retry = true; // Prevent infinite retry loops
-          _context2.prev = 3;
-          _context2.next = 6;
-          return refreshAccessToken();
-        case 6:
-          newAccessToken = _context2.sent;
-          originalRequest.headers.Authorization = "Bearer ".concat(newAccessToken);
-          return _context2.abrupt("return", api(originalRequest));
-        case 11:
-          _context2.prev = 11;
-          _context2.t0 = _context2["catch"](3);
+          return _context.abrupt("return", Promise.reject(error));
+        case 3:
+          if (!(error.response.status === 401 && !(originalRequest !== null && originalRequest !== void 0 && originalRequest._redirected))) {
+            _context.next = 11;
+            break;
+          }
+          originalRequest._redirected = true;
           basePath = window.location.pathname.split("/")[1];
-          redirectPath = "/".concat(basePath, "/login");
-          console.error("Token refresh failed:", _context2.t0);
+          redirectPath = "/".concat(basePath, "/login"); // optional: clear tokens
+          localStorage.removeItem(ACCESS_TOKEN_KEY);
+          localStorage.removeItem(REFRESH_TOKEN_KEY);
           window.location.href = redirectPath;
-          return _context2.abrupt("return", Promise.reject(_context2.t0));
-        case 18:
-          return _context2.abrupt("return", Promise.reject(error));
-        case 19:
+          return _context.abrupt("return");
+        case 11:
+          return _context.abrupt("return", Promise.reject(error));
+        case 12:
         case "end":
-          return _context2.stop();
+          return _context.stop();
       }
-    }, _callee2, null, [[3, 11]]);
+    }, _callee);
   }));
   return function (_x) {
-    return _ref2.apply(this, arguments);
+    return _ref.apply(this, arguments);
   };
 }());
 export default api;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@banch0u/core-project-test-repository",
-  "version": "2.2.3",
+  "version": "2.2.4",
   "description": "Shared core features for all projects",
   "main": "dist/index.js",
   "files": [