npm - @fctc/interface-logic - Versions diffs - 3.8.9 → 3.8.10 - Mend

@fctc/interface-logic 3.8.9 → 3.8.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/dist/configs.js CHANGED Viewed

@@ -2276,12 +2276,10 @@ var axiosClient = {
       timeout: 5e4,
       paramsSerializer: (params) => new URLSearchParams(params).toString()
     });
-    instance.interceptors.request.use(async (config2) => {
-      const useRefreshToken = config2.headers["X-Use-Refresh-Token"] === "true";
-      const useActionToken = config2.headers["X-Use-Action-Token"] === "true";
-      const actionToken = config2.headers["X-Action-Token"];
-      console.log("config", config2);
-      console.log("useRefreshToken", useRefreshToken);
+    instance.interceptors.request.use(async (configReq) => {
+      const useRefreshToken = configReq.headers["X-Use-Refresh-Token"] === "true";
+      const useActionToken = configReq.headers["X-Use-Action-Token"] === "true";
+      const actionToken = configReq.headers["X-Action-Token"];
       let token = null;
       if (useActionToken && actionToken) {
         token = actionToken;
@@ -2290,14 +2288,109 @@ var axiosClient = {
         token = await getToken?.();
       }
       if (token) {
-        config2.headers["Authorization"] = `Bearer ${token}`;
+        configReq.headers["Authorization"] = `Bearer ${token}`;
       }
       if (database) {
-        config2.headers["DATABASE"] = database;
+        configReq.headers["DATABASE"] = database;
       }
-      if (token) config2.headers["Authorization"] = `Bearer ${token}`;
-      return config2;
+      return configReq;
     }, Promise.reject);
+    const buildRefreshUrl = () => {
+      if (!config.refreshTokenEndpoint) {
+        return `${getBaseUrl(config?.baseUrl)}${"/authentication/oauth2/token" /* AUTH_TOKEN_PATH */}`;
+      }
+      const ep = String(config.refreshTokenEndpoint);
+      if (/^https?:\/\//i.test(ep)) return ep;
+      const cleanBase = String(config?.baseUrl || "").replace(/\/$/, "");
+      const cleanEp = ep.startsWith("/") ? ep : `/${ep}`;
+      return `${cleanBase}${cleanEp}`;
+    };
+    instance.interceptors.response.use(
+      (response) => handleResponse(response),
+      async (error) => {
+        const handleError3 = async (err) => {
+          if (!err.response) return err;
+          const { data } = err.response;
+          if (data && data.code === 400 && ["invalid_grant"].includes(data.data?.error)) {
+            await clearAuthToken();
+          }
+          return data;
+        };
+        const originalRequest = error.config;
+        if ((error.response?.status === 403 || error.response?.status === 401 || error.response?.status === 404) && ["TOKEN_EXPIRED", "AUTHEN_FAIL", 401, "ERR_2FA_006"].includes(
+          error.response.data.code
+        )) {
+          if (isRefreshing) {
+            return new Promise(function(resolve, reject) {
+              failedQueue.push({ resolve, reject });
+            }).then((newToken) => {
+              originalRequest.headers["Authorization"] = "Bearer " + newToken;
+              originalRequest.data = updateTokenParamInOriginalRequest(
+                originalRequest,
+                newToken
+              );
+              return instance.request(originalRequest);
+            }).catch(async (err) => {
+              if ((err.response?.status === 400 || err.response?.status === 401) && ["invalid_grant"].includes(err.response.data.error)) {
+                await clearAuthToken();
+              }
+            });
+          }
+          const browserSession = await sessionStorage2.getBrowserSession();
+          const refreshToken = await localStorage2.getRefreshToken();
+          const accessTokenExp = await localStorage2.getAccessToken();
+          isRefreshing = true;
+          if (!refreshToken && (!browserSession || browserSession == "unActive")) {
+            await clearAuthToken();
+          } else {
+            const payload = Object.fromEntries(
+              Object.entries({
+                refresh_token: refreshToken,
+                grant_type: "refresh_token",
+                client_id: config.config.clientId,
+                client_secret: config.config.clientSecret
+              }).filter(([_, v]) => !!v)
+            );
+            const refreshUrl = buildRefreshUrl();
+            return new Promise(function(resolve) {
+              import_axios.default.post(refreshUrl, payload, {
+                headers: {
+                  "Content-Type": config.refreshTokenEndpoint ? "application/x-www-form-urlencoded" : "multipart/form-data",
+                  Authorization: `Bearer ${accessTokenExp}`
+                }
+              }).then(async (res) => {
+                const data = res.data;
+                await localStorage2.setToken(data.access_token);
+                await localStorage2.setRefreshToken(data.refresh_token);
+                import_axios.default.defaults.headers.common["Authorization"] = "Bearer " + data.access_token;
+                originalRequest.headers["Authorization"] = "Bearer " + data.access_token;
+                originalRequest.data = updateTokenParamInOriginalRequest(
+                  originalRequest,
+                  data.access_token
+                );
+                processQueue(null, data.access_token);
+                resolve(instance.request(originalRequest));
+              }).catch(async (err) => {
+                if (err && (err?.error_code === "AUTHEN_FAIL" || err?.error_code === "TOKEN_EXPIRED" || err?.error_code === "TOKEN_INCORRECT" || err?.code === "ERR_2FA_006")) {
+                  await clearAuthToken();
+                }
+                if (err && err.response) {
+                  const { error_code } = err.response?.data || {};
+                  const { code } = err;
+                  if (error_code === "AUTHEN_FAIL" || code === "ERR_2FA_006") {
+                    await clearAuthToken();
+                  }
+                }
+                processQueue(err, null);
+              }).finally(() => {
+                isRefreshing = false;
+              });
+            });
+          }
+        }
+        return Promise.reject(await handleError3(error));
+      }
+    );
     instance.interceptors.response.use(
       (response) => {
         return handleResponse(response);
@@ -2317,7 +2410,6 @@ var axiosClient = {
         if ((error.response?.status === 403 || error.response?.status === 401 || error.response?.status === 404) && ["TOKEN_EXPIRED", "AUTHEN_FAIL", 401, "ERR_2FA_006"].includes(
           error.response.data.code
         )) {
-          console.log("isRefreshing", isRefreshing);
           if (isRefreshing) {
             return new Promise(function(resolve, reject) {
               failedQueue.push({ resolve, reject });
@@ -2339,7 +2431,6 @@ var axiosClient = {
           const accessTokenExp = await localStorage2.getAccessToken();
           isRefreshing = true;
           if (!refreshToken && (!browserSession || browserSession == "unActive")) {
-            console.log("222");
             await clearAuthToken();
           } else {
             const payload = Object.fromEntries(
@@ -2350,7 +2441,6 @@ var axiosClient = {
                 client_secret: config.config.clientSecret
               }).filter(([_, value]) => !!value)
             );
-            console.log("111");
             return new Promise(function(resolve) {
               import_axios.default.post(
                 `${config?.baseUrl}${config.refreshTokenEndpoint ?? "/authentication/oauth2/token" /* AUTH_TOKEN_PATH */}`,

package/dist/configs.mjs CHANGED Viewed

@@ -2240,12 +2240,10 @@ var axiosClient = {
       timeout: 5e4,
       paramsSerializer: (params) => new URLSearchParams(params).toString()
     });
-    instance.interceptors.request.use(async (config2) => {
-      const useRefreshToken = config2.headers["X-Use-Refresh-Token"] === "true";
-      const useActionToken = config2.headers["X-Use-Action-Token"] === "true";
-      const actionToken = config2.headers["X-Action-Token"];
-      console.log("config", config2);
-      console.log("useRefreshToken", useRefreshToken);
+    instance.interceptors.request.use(async (configReq) => {
+      const useRefreshToken = configReq.headers["X-Use-Refresh-Token"] === "true";
+      const useActionToken = configReq.headers["X-Use-Action-Token"] === "true";
+      const actionToken = configReq.headers["X-Action-Token"];
       let token = null;
       if (useActionToken && actionToken) {
         token = actionToken;
@@ -2254,14 +2252,109 @@ var axiosClient = {
         token = await getToken?.();
       }
       if (token) {
-        config2.headers["Authorization"] = `Bearer ${token}`;
+        configReq.headers["Authorization"] = `Bearer ${token}`;
       }
       if (database) {
-        config2.headers["DATABASE"] = database;
+        configReq.headers["DATABASE"] = database;
       }
-      if (token) config2.headers["Authorization"] = `Bearer ${token}`;
-      return config2;
+      return configReq;
     }, Promise.reject);
+    const buildRefreshUrl = () => {
+      if (!config.refreshTokenEndpoint) {
+        return `${getBaseUrl(config?.baseUrl)}${"/authentication/oauth2/token" /* AUTH_TOKEN_PATH */}`;
+      }
+      const ep = String(config.refreshTokenEndpoint);
+      if (/^https?:\/\//i.test(ep)) return ep;
+      const cleanBase = String(config?.baseUrl || "").replace(/\/$/, "");
+      const cleanEp = ep.startsWith("/") ? ep : `/${ep}`;
+      return `${cleanBase}${cleanEp}`;
+    };
+    instance.interceptors.response.use(
+      (response) => handleResponse(response),
+      async (error) => {
+        const handleError3 = async (err) => {
+          if (!err.response) return err;
+          const { data } = err.response;
+          if (data && data.code === 400 && ["invalid_grant"].includes(data.data?.error)) {
+            await clearAuthToken();
+          }
+          return data;
+        };
+        const originalRequest = error.config;
+        if ((error.response?.status === 403 || error.response?.status === 401 || error.response?.status === 404) && ["TOKEN_EXPIRED", "AUTHEN_FAIL", 401, "ERR_2FA_006"].includes(
+          error.response.data.code
+        )) {
+          if (isRefreshing) {
+            return new Promise(function(resolve, reject) {
+              failedQueue.push({ resolve, reject });
+            }).then((newToken) => {
+              originalRequest.headers["Authorization"] = "Bearer " + newToken;
+              originalRequest.data = updateTokenParamInOriginalRequest(
+                originalRequest,
+                newToken
+              );
+              return instance.request(originalRequest);
+            }).catch(async (err) => {
+              if ((err.response?.status === 400 || err.response?.status === 401) && ["invalid_grant"].includes(err.response.data.error)) {
+                await clearAuthToken();
+              }
+            });
+          }
+          const browserSession = await sessionStorage2.getBrowserSession();
+          const refreshToken = await localStorage2.getRefreshToken();
+          const accessTokenExp = await localStorage2.getAccessToken();
+          isRefreshing = true;
+          if (!refreshToken && (!browserSession || browserSession == "unActive")) {
+            await clearAuthToken();
+          } else {
+            const payload = Object.fromEntries(
+              Object.entries({
+                refresh_token: refreshToken,
+                grant_type: "refresh_token",
+                client_id: config.config.clientId,
+                client_secret: config.config.clientSecret
+              }).filter(([_, v]) => !!v)
+            );
+            const refreshUrl = buildRefreshUrl();
+            return new Promise(function(resolve) {
+              axios.post(refreshUrl, payload, {
+                headers: {
+                  "Content-Type": config.refreshTokenEndpoint ? "application/x-www-form-urlencoded" : "multipart/form-data",
+                  Authorization: `Bearer ${accessTokenExp}`
+                }
+              }).then(async (res) => {
+                const data = res.data;
+                await localStorage2.setToken(data.access_token);
+                await localStorage2.setRefreshToken(data.refresh_token);
+                axios.defaults.headers.common["Authorization"] = "Bearer " + data.access_token;
+                originalRequest.headers["Authorization"] = "Bearer " + data.access_token;
+                originalRequest.data = updateTokenParamInOriginalRequest(
+                  originalRequest,
+                  data.access_token
+                );
+                processQueue(null, data.access_token);
+                resolve(instance.request(originalRequest));
+              }).catch(async (err) => {
+                if (err && (err?.error_code === "AUTHEN_FAIL" || err?.error_code === "TOKEN_EXPIRED" || err?.error_code === "TOKEN_INCORRECT" || err?.code === "ERR_2FA_006")) {
+                  await clearAuthToken();
+                }
+                if (err && err.response) {
+                  const { error_code } = err.response?.data || {};
+                  const { code } = err;
+                  if (error_code === "AUTHEN_FAIL" || code === "ERR_2FA_006") {
+                    await clearAuthToken();
+                  }
+                }
+                processQueue(err, null);
+              }).finally(() => {
+                isRefreshing = false;
+              });
+            });
+          }
+        }
+        return Promise.reject(await handleError3(error));
+      }
+    );
     instance.interceptors.response.use(
       (response) => {
         return handleResponse(response);
@@ -2281,7 +2374,6 @@ var axiosClient = {
         if ((error.response?.status === 403 || error.response?.status === 401 || error.response?.status === 404) && ["TOKEN_EXPIRED", "AUTHEN_FAIL", 401, "ERR_2FA_006"].includes(
           error.response.data.code
         )) {
-          console.log("isRefreshing", isRefreshing);
           if (isRefreshing) {
             return new Promise(function(resolve, reject) {
               failedQueue.push({ resolve, reject });
@@ -2303,7 +2395,6 @@ var axiosClient = {
           const accessTokenExp = await localStorage2.getAccessToken();
           isRefreshing = true;
           if (!refreshToken && (!browserSession || browserSession == "unActive")) {
-            console.log("222");
             await clearAuthToken();
           } else {
             const payload = Object.fromEntries(
@@ -2314,7 +2405,6 @@ var axiosClient = {
                 client_secret: config.config.clientSecret
               }).filter(([_, value]) => !!value)
             );
-            console.log("111");
             return new Promise(function(resolve) {
               axios.post(
                 `${config?.baseUrl}${config.refreshTokenEndpoint ?? "/authentication/oauth2/token" /* AUTH_TOKEN_PATH */}`,

package/dist/environment.js CHANGED Viewed

@@ -2278,12 +2278,10 @@ var axiosClient = {
       timeout: 5e4,
       paramsSerializer: (params) => new URLSearchParams(params).toString()
     });
-    instance.interceptors.request.use(async (config2) => {
-      const useRefreshToken = config2.headers["X-Use-Refresh-Token"] === "true";
-      const useActionToken = config2.headers["X-Use-Action-Token"] === "true";
-      const actionToken = config2.headers["X-Action-Token"];
-      console.log("config", config2);
-      console.log("useRefreshToken", useRefreshToken);
+    instance.interceptors.request.use(async (configReq) => {
+      const useRefreshToken = configReq.headers["X-Use-Refresh-Token"] === "true";
+      const useActionToken = configReq.headers["X-Use-Action-Token"] === "true";
+      const actionToken = configReq.headers["X-Action-Token"];
       let token = null;
       if (useActionToken && actionToken) {
         token = actionToken;
@@ -2292,14 +2290,109 @@ var axiosClient = {
         token = await getToken?.();
       }
       if (token) {
-        config2.headers["Authorization"] = `Bearer ${token}`;
+        configReq.headers["Authorization"] = `Bearer ${token}`;
       }
       if (database) {
-        config2.headers["DATABASE"] = database;
+        configReq.headers["DATABASE"] = database;
       }
-      if (token) config2.headers["Authorization"] = `Bearer ${token}`;
-      return config2;
+      return configReq;
     }, Promise.reject);
+    const buildRefreshUrl = () => {
+      if (!config.refreshTokenEndpoint) {
+        return `${getBaseUrl(config?.baseUrl)}${"/authentication/oauth2/token" /* AUTH_TOKEN_PATH */}`;
+      }
+      const ep = String(config.refreshTokenEndpoint);
+      if (/^https?:\/\//i.test(ep)) return ep;
+      const cleanBase = String(config?.baseUrl || "").replace(/\/$/, "");
+      const cleanEp = ep.startsWith("/") ? ep : `/${ep}`;
+      return `${cleanBase}${cleanEp}`;
+    };
+    instance.interceptors.response.use(
+      (response) => handleResponse(response),
+      async (error) => {
+        const handleError3 = async (err) => {
+          if (!err.response) return err;
+          const { data } = err.response;
+          if (data && data.code === 400 && ["invalid_grant"].includes(data.data?.error)) {
+            await clearAuthToken();
+          }
+          return data;
+        };
+        const originalRequest = error.config;
+        if ((error.response?.status === 403 || error.response?.status === 401 || error.response?.status === 404) && ["TOKEN_EXPIRED", "AUTHEN_FAIL", 401, "ERR_2FA_006"].includes(
+          error.response.data.code
+        )) {
+          if (isRefreshing) {
+            return new Promise(function(resolve, reject) {
+              failedQueue.push({ resolve, reject });
+            }).then((newToken) => {
+              originalRequest.headers["Authorization"] = "Bearer " + newToken;
+              originalRequest.data = updateTokenParamInOriginalRequest(
+                originalRequest,
+                newToken
+              );
+              return instance.request(originalRequest);
+            }).catch(async (err) => {
+              if ((err.response?.status === 400 || err.response?.status === 401) && ["invalid_grant"].includes(err.response.data.error)) {
+                await clearAuthToken();
+              }
+            });
+          }
+          const browserSession = await sessionStorage2.getBrowserSession();
+          const refreshToken = await localStorage2.getRefreshToken();
+          const accessTokenExp = await localStorage2.getAccessToken();
+          isRefreshing = true;
+          if (!refreshToken && (!browserSession || browserSession == "unActive")) {
+            await clearAuthToken();
+          } else {
+            const payload = Object.fromEntries(
+              Object.entries({
+                refresh_token: refreshToken,
+                grant_type: "refresh_token",
+                client_id: config.config.clientId,
+                client_secret: config.config.clientSecret
+              }).filter(([_, v]) => !!v)
+            );
+            const refreshUrl = buildRefreshUrl();
+            return new Promise(function(resolve) {
+              import_axios.default.post(refreshUrl, payload, {
+                headers: {
+                  "Content-Type": config.refreshTokenEndpoint ? "application/x-www-form-urlencoded" : "multipart/form-data",
+                  Authorization: `Bearer ${accessTokenExp}`
+                }
+              }).then(async (res) => {
+                const data = res.data;
+                await localStorage2.setToken(data.access_token);
+                await localStorage2.setRefreshToken(data.refresh_token);
+                import_axios.default.defaults.headers.common["Authorization"] = "Bearer " + data.access_token;
+                originalRequest.headers["Authorization"] = "Bearer " + data.access_token;
+                originalRequest.data = updateTokenParamInOriginalRequest(
+                  originalRequest,
+                  data.access_token
+                );
+                processQueue(null, data.access_token);
+                resolve(instance.request(originalRequest));
+              }).catch(async (err) => {
+                if (err && (err?.error_code === "AUTHEN_FAIL" || err?.error_code === "TOKEN_EXPIRED" || err?.error_code === "TOKEN_INCORRECT" || err?.code === "ERR_2FA_006")) {
+                  await clearAuthToken();
+                }
+                if (err && err.response) {
+                  const { error_code } = err.response?.data || {};
+                  const { code } = err;
+                  if (error_code === "AUTHEN_FAIL" || code === "ERR_2FA_006") {
+                    await clearAuthToken();
+                  }
+                }
+                processQueue(err, null);
+              }).finally(() => {
+                isRefreshing = false;
+              });
+            });
+          }
+        }
+        return Promise.reject(await handleError3(error));
+      }
+    );
     instance.interceptors.response.use(
       (response) => {
         return handleResponse(response);
@@ -2319,7 +2412,6 @@ var axiosClient = {
         if ((error.response?.status === 403 || error.response?.status === 401 || error.response?.status === 404) && ["TOKEN_EXPIRED", "AUTHEN_FAIL", 401, "ERR_2FA_006"].includes(
           error.response.data.code
         )) {
-          console.log("isRefreshing", isRefreshing);
           if (isRefreshing) {
             return new Promise(function(resolve, reject) {
               failedQueue.push({ resolve, reject });
@@ -2341,7 +2433,6 @@ var axiosClient = {
           const accessTokenExp = await localStorage2.getAccessToken();
           isRefreshing = true;
           if (!refreshToken && (!browserSession || browserSession == "unActive")) {
-            console.log("222");
             await clearAuthToken();
           } else {
             const payload = Object.fromEntries(
@@ -2352,7 +2443,6 @@ var axiosClient = {
                 client_secret: config.config.clientSecret
               }).filter(([_, value]) => !!value)
             );
-            console.log("111");
             return new Promise(function(resolve) {
               import_axios.default.post(
                 `${config?.baseUrl}${config.refreshTokenEndpoint ?? "/authentication/oauth2/token" /* AUTH_TOKEN_PATH */}`,

package/dist/environment.mjs CHANGED Viewed

@@ -2240,12 +2240,10 @@ var axiosClient = {
       timeout: 5e4,
       paramsSerializer: (params) => new URLSearchParams(params).toString()
     });
-    instance.interceptors.request.use(async (config2) => {
-      const useRefreshToken = config2.headers["X-Use-Refresh-Token"] === "true";
-      const useActionToken = config2.headers["X-Use-Action-Token"] === "true";
-      const actionToken = config2.headers["X-Action-Token"];
-      console.log("config", config2);
-      console.log("useRefreshToken", useRefreshToken);
+    instance.interceptors.request.use(async (configReq) => {
+      const useRefreshToken = configReq.headers["X-Use-Refresh-Token"] === "true";
+      const useActionToken = configReq.headers["X-Use-Action-Token"] === "true";
+      const actionToken = configReq.headers["X-Action-Token"];
       let token = null;
       if (useActionToken && actionToken) {
         token = actionToken;
@@ -2254,14 +2252,109 @@ var axiosClient = {
         token = await getToken?.();
       }
       if (token) {
-        config2.headers["Authorization"] = `Bearer ${token}`;
+        configReq.headers["Authorization"] = `Bearer ${token}`;
       }
       if (database) {
-        config2.headers["DATABASE"] = database;
+        configReq.headers["DATABASE"] = database;
       }
-      if (token) config2.headers["Authorization"] = `Bearer ${token}`;
-      return config2;
+      return configReq;
     }, Promise.reject);
+    const buildRefreshUrl = () => {
+      if (!config.refreshTokenEndpoint) {
+        return `${getBaseUrl(config?.baseUrl)}${"/authentication/oauth2/token" /* AUTH_TOKEN_PATH */}`;
+      }
+      const ep = String(config.refreshTokenEndpoint);
+      if (/^https?:\/\//i.test(ep)) return ep;
+      const cleanBase = String(config?.baseUrl || "").replace(/\/$/, "");
+      const cleanEp = ep.startsWith("/") ? ep : `/${ep}`;
+      return `${cleanBase}${cleanEp}`;
+    };
+    instance.interceptors.response.use(
+      (response) => handleResponse(response),
+      async (error) => {
+        const handleError3 = async (err) => {
+          if (!err.response) return err;
+          const { data } = err.response;
+          if (data && data.code === 400 && ["invalid_grant"].includes(data.data?.error)) {
+            await clearAuthToken();
+          }
+          return data;
+        };
+        const originalRequest = error.config;
+        if ((error.response?.status === 403 || error.response?.status === 401 || error.response?.status === 404) && ["TOKEN_EXPIRED", "AUTHEN_FAIL", 401, "ERR_2FA_006"].includes(
+          error.response.data.code
+        )) {
+          if (isRefreshing) {
+            return new Promise(function(resolve, reject) {
+              failedQueue.push({ resolve, reject });
+            }).then((newToken) => {
+              originalRequest.headers["Authorization"] = "Bearer " + newToken;
+              originalRequest.data = updateTokenParamInOriginalRequest(
+                originalRequest,
+                newToken
+              );
+              return instance.request(originalRequest);
+            }).catch(async (err) => {
+              if ((err.response?.status === 400 || err.response?.status === 401) && ["invalid_grant"].includes(err.response.data.error)) {
+                await clearAuthToken();
+              }
+            });
+          }
+          const browserSession = await sessionStorage2.getBrowserSession();
+          const refreshToken = await localStorage2.getRefreshToken();
+          const accessTokenExp = await localStorage2.getAccessToken();
+          isRefreshing = true;
+          if (!refreshToken && (!browserSession || browserSession == "unActive")) {
+            await clearAuthToken();
+          } else {
+            const payload = Object.fromEntries(
+              Object.entries({
+                refresh_token: refreshToken,
+                grant_type: "refresh_token",
+                client_id: config.config.clientId,
+                client_secret: config.config.clientSecret
+              }).filter(([_, v]) => !!v)
+            );
+            const refreshUrl = buildRefreshUrl();
+            return new Promise(function(resolve) {
+              axios.post(refreshUrl, payload, {
+                headers: {
+                  "Content-Type": config.refreshTokenEndpoint ? "application/x-www-form-urlencoded" : "multipart/form-data",
+                  Authorization: `Bearer ${accessTokenExp}`
+                }
+              }).then(async (res) => {
+                const data = res.data;
+                await localStorage2.setToken(data.access_token);
+                await localStorage2.setRefreshToken(data.refresh_token);
+                axios.defaults.headers.common["Authorization"] = "Bearer " + data.access_token;
+                originalRequest.headers["Authorization"] = "Bearer " + data.access_token;
+                originalRequest.data = updateTokenParamInOriginalRequest(
+                  originalRequest,
+                  data.access_token
+                );
+                processQueue(null, data.access_token);
+                resolve(instance.request(originalRequest));
+              }).catch(async (err) => {
+                if (err && (err?.error_code === "AUTHEN_FAIL" || err?.error_code === "TOKEN_EXPIRED" || err?.error_code === "TOKEN_INCORRECT" || err?.code === "ERR_2FA_006")) {
+                  await clearAuthToken();
+                }
+                if (err && err.response) {
+                  const { error_code } = err.response?.data || {};
+                  const { code } = err;
+                  if (error_code === "AUTHEN_FAIL" || code === "ERR_2FA_006") {
+                    await clearAuthToken();
+                  }
+                }
+                processQueue(err, null);
+              }).finally(() => {
+                isRefreshing = false;
+              });
+            });
+          }
+        }
+        return Promise.reject(await handleError3(error));
+      }
+    );
     instance.interceptors.response.use(
       (response) => {
         return handleResponse(response);
@@ -2281,7 +2374,6 @@ var axiosClient = {
         if ((error.response?.status === 403 || error.response?.status === 401 || error.response?.status === 404) && ["TOKEN_EXPIRED", "AUTHEN_FAIL", 401, "ERR_2FA_006"].includes(
           error.response.data.code
         )) {
-          console.log("isRefreshing", isRefreshing);
           if (isRefreshing) {
             return new Promise(function(resolve, reject) {
               failedQueue.push({ resolve, reject });
@@ -2303,7 +2395,6 @@ var axiosClient = {
           const accessTokenExp = await localStorage2.getAccessToken();
           isRefreshing = true;
           if (!refreshToken && (!browserSession || browserSession == "unActive")) {
-            console.log("222");
             await clearAuthToken();
           } else {
             const payload = Object.fromEntries(
@@ -2314,7 +2405,6 @@ var axiosClient = {
                 client_secret: config.config.clientSecret
               }).filter(([_, value]) => !!value)
             );
-            console.log("111");
             return new Promise(function(resolve) {
               axios.post(
                 `${config?.baseUrl}${config.refreshTokenEndpoint ?? "/authentication/oauth2/token" /* AUTH_TOKEN_PATH */}`,

package/dist/provider.js CHANGED Viewed

@@ -5915,12 +5915,10 @@ var axiosClient = {
       timeout: 5e4,
       paramsSerializer: (params) => new URLSearchParams(params).toString()
     });
-    instance.interceptors.request.use(async (config2) => {
-      const useRefreshToken = config2.headers["X-Use-Refresh-Token"] === "true";
-      const useActionToken = config2.headers["X-Use-Action-Token"] === "true";
-      const actionToken = config2.headers["X-Action-Token"];
-      console.log("config", config2);
-      console.log("useRefreshToken", useRefreshToken);
+    instance.interceptors.request.use(async (configReq) => {
+      const useRefreshToken = configReq.headers["X-Use-Refresh-Token"] === "true";
+      const useActionToken = configReq.headers["X-Use-Action-Token"] === "true";
+      const actionToken = configReq.headers["X-Action-Token"];
       let token = null;
       if (useActionToken && actionToken) {
         token = actionToken;
@@ -5929,14 +5927,109 @@ var axiosClient = {
         token = await getToken?.();
       }
       if (token) {
-        config2.headers["Authorization"] = `Bearer ${token}`;
+        configReq.headers["Authorization"] = `Bearer ${token}`;
       }
       if (database) {
-        config2.headers["DATABASE"] = database;
+        configReq.headers["DATABASE"] = database;
       }
-      if (token) config2.headers["Authorization"] = `Bearer ${token}`;
-      return config2;
+      return configReq;
     }, Promise.reject);
+    const buildRefreshUrl = () => {
+      if (!config.refreshTokenEndpoint) {
+        return `${getBaseUrl(config?.baseUrl)}${"/authentication/oauth2/token" /* AUTH_TOKEN_PATH */}`;
+      }
+      const ep = String(config.refreshTokenEndpoint);
+      if (/^https?:\/\//i.test(ep)) return ep;
+      const cleanBase = String(config?.baseUrl || "").replace(/\/$/, "");
+      const cleanEp = ep.startsWith("/") ? ep : `/${ep}`;
+      return `${cleanBase}${cleanEp}`;
+    };
+    instance.interceptors.response.use(
+      (response) => handleResponse(response),
+      async (error) => {
+        const handleError3 = async (err) => {
+          if (!err.response) return err;
+          const { data } = err.response;
+          if (data && data.code === 400 && ["invalid_grant"].includes(data.data?.error)) {
+            await clearAuthToken();
+          }
+          return data;
+        };
+        const originalRequest = error.config;
+        if ((error.response?.status === 403 || error.response?.status === 401 || error.response?.status === 404) && ["TOKEN_EXPIRED", "AUTHEN_FAIL", 401, "ERR_2FA_006"].includes(
+          error.response.data.code
+        )) {
+          if (isRefreshing) {
+            return new Promise(function(resolve, reject) {
+              failedQueue.push({ resolve, reject });
+            }).then((newToken) => {
+              originalRequest.headers["Authorization"] = "Bearer " + newToken;
+              originalRequest.data = updateTokenParamInOriginalRequest(
+                originalRequest,
+                newToken
+              );
+              return instance.request(originalRequest);
+            }).catch(async (err) => {
+              if ((err.response?.status === 400 || err.response?.status === 401) && ["invalid_grant"].includes(err.response.data.error)) {
+                await clearAuthToken();
+              }
+            });
+          }
+          const browserSession = await sessionStorage2.getBrowserSession();
+          const refreshToken = await localStorage2.getRefreshToken();
+          const accessTokenExp = await localStorage2.getAccessToken();
+          isRefreshing = true;
+          if (!refreshToken && (!browserSession || browserSession == "unActive")) {
+            await clearAuthToken();
+          } else {
+            const payload = Object.fromEntries(
+              Object.entries({
+                refresh_token: refreshToken,
+                grant_type: "refresh_token",
+                client_id: config.config.clientId,
+                client_secret: config.config.clientSecret
+              }).filter(([_, v]) => !!v)
+            );
+            const refreshUrl = buildRefreshUrl();
+            return new Promise(function(resolve) {
+              import_axios.default.post(refreshUrl, payload, {
+                headers: {
+                  "Content-Type": config.refreshTokenEndpoint ? "application/x-www-form-urlencoded" : "multipart/form-data",
+                  Authorization: `Bearer ${accessTokenExp}`
+                }
+              }).then(async (res) => {
+                const data = res.data;
+                await localStorage2.setToken(data.access_token);
+                await localStorage2.setRefreshToken(data.refresh_token);
+                import_axios.default.defaults.headers.common["Authorization"] = "Bearer " + data.access_token;
+                originalRequest.headers["Authorization"] = "Bearer " + data.access_token;
+                originalRequest.data = updateTokenParamInOriginalRequest(
+                  originalRequest,
+                  data.access_token
+                );
+                processQueue(null, data.access_token);
+                resolve(instance.request(originalRequest));
+              }).catch(async (err) => {
+                if (err && (err?.error_code === "AUTHEN_FAIL" || err?.error_code === "TOKEN_EXPIRED" || err?.error_code === "TOKEN_INCORRECT" || err?.code === "ERR_2FA_006")) {
+                  await clearAuthToken();
+                }
+                if (err && err.response) {
+                  const { error_code } = err.response?.data || {};
+                  const { code } = err;
+                  if (error_code === "AUTHEN_FAIL" || code === "ERR_2FA_006") {
+                    await clearAuthToken();
+                  }
+                }
+                processQueue(err, null);
+              }).finally(() => {
+                isRefreshing = false;
+              });
+            });
+          }
+        }
+        return Promise.reject(await handleError3(error));
+      }
+    );
     instance.interceptors.response.use(
       (response) => {
         return handleResponse(response);
@@ -5956,7 +6049,6 @@ var axiosClient = {
         if ((error.response?.status === 403 || error.response?.status === 401 || error.response?.status === 404) && ["TOKEN_EXPIRED", "AUTHEN_FAIL", 401, "ERR_2FA_006"].includes(
           error.response.data.code
         )) {
-          console.log("isRefreshing", isRefreshing);
           if (isRefreshing) {
             return new Promise(function(resolve, reject) {
               failedQueue.push({ resolve, reject });
@@ -5978,7 +6070,6 @@ var axiosClient = {
           const accessTokenExp = await localStorage2.getAccessToken();
           isRefreshing = true;
           if (!refreshToken && (!browserSession || browserSession == "unActive")) {
-            console.log("222");
             await clearAuthToken();
           } else {
             const payload = Object.fromEntries(
@@ -5989,7 +6080,6 @@ var axiosClient = {
                 client_secret: config.config.clientSecret
               }).filter(([_, value]) => !!value)
             );
-            console.log("111");
             return new Promise(function(resolve) {
               import_axios.default.post(
                 `${config?.baseUrl}${config.refreshTokenEndpoint ?? "/authentication/oauth2/token" /* AUTH_TOKEN_PATH */}`,

package/dist/provider.mjs CHANGED Viewed

@@ -5872,12 +5872,10 @@ var axiosClient = {
       timeout: 5e4,
       paramsSerializer: (params) => new URLSearchParams(params).toString()
     });
-    instance.interceptors.request.use(async (config2) => {
-      const useRefreshToken = config2.headers["X-Use-Refresh-Token"] === "true";
-      const useActionToken = config2.headers["X-Use-Action-Token"] === "true";
-      const actionToken = config2.headers["X-Action-Token"];
-      console.log("config", config2);
-      console.log("useRefreshToken", useRefreshToken);
+    instance.interceptors.request.use(async (configReq) => {
+      const useRefreshToken = configReq.headers["X-Use-Refresh-Token"] === "true";
+      const useActionToken = configReq.headers["X-Use-Action-Token"] === "true";
+      const actionToken = configReq.headers["X-Action-Token"];
       let token = null;
       if (useActionToken && actionToken) {
         token = actionToken;
@@ -5886,14 +5884,109 @@ var axiosClient = {
         token = await getToken?.();
       }
       if (token) {
-        config2.headers["Authorization"] = `Bearer ${token}`;
+        configReq.headers["Authorization"] = `Bearer ${token}`;
       }
       if (database) {
-        config2.headers["DATABASE"] = database;
+        configReq.headers["DATABASE"] = database;
       }
-      if (token) config2.headers["Authorization"] = `Bearer ${token}`;
-      return config2;
+      return configReq;
     }, Promise.reject);
+    const buildRefreshUrl = () => {
+      if (!config.refreshTokenEndpoint) {
+        return `${getBaseUrl(config?.baseUrl)}${"/authentication/oauth2/token" /* AUTH_TOKEN_PATH */}`;
+      }
+      const ep = String(config.refreshTokenEndpoint);
+      if (/^https?:\/\//i.test(ep)) return ep;
+      const cleanBase = String(config?.baseUrl || "").replace(/\/$/, "");
+      const cleanEp = ep.startsWith("/") ? ep : `/${ep}`;
+      return `${cleanBase}${cleanEp}`;
+    };
+    instance.interceptors.response.use(
+      (response) => handleResponse(response),
+      async (error) => {
+        const handleError3 = async (err) => {
+          if (!err.response) return err;
+          const { data } = err.response;
+          if (data && data.code === 400 && ["invalid_grant"].includes(data.data?.error)) {
+            await clearAuthToken();
+          }
+          return data;
+        };
+        const originalRequest = error.config;
+        if ((error.response?.status === 403 || error.response?.status === 401 || error.response?.status === 404) && ["TOKEN_EXPIRED", "AUTHEN_FAIL", 401, "ERR_2FA_006"].includes(
+          error.response.data.code
+        )) {
+          if (isRefreshing) {
+            return new Promise(function(resolve, reject) {
+              failedQueue.push({ resolve, reject });
+            }).then((newToken) => {
+              originalRequest.headers["Authorization"] = "Bearer " + newToken;
+              originalRequest.data = updateTokenParamInOriginalRequest(
+                originalRequest,
+                newToken
+              );
+              return instance.request(originalRequest);
+            }).catch(async (err) => {
+              if ((err.response?.status === 400 || err.response?.status === 401) && ["invalid_grant"].includes(err.response.data.error)) {
+                await clearAuthToken();
+              }
+            });
+          }
+          const browserSession = await sessionStorage2.getBrowserSession();
+          const refreshToken = await localStorage2.getRefreshToken();
+          const accessTokenExp = await localStorage2.getAccessToken();
+          isRefreshing = true;
+          if (!refreshToken && (!browserSession || browserSession == "unActive")) {
+            await clearAuthToken();
+          } else {
+            const payload = Object.fromEntries(
+              Object.entries({
+                refresh_token: refreshToken,
+                grant_type: "refresh_token",
+                client_id: config.config.clientId,
+                client_secret: config.config.clientSecret
+              }).filter(([_, v]) => !!v)
+            );
+            const refreshUrl = buildRefreshUrl();
+            return new Promise(function(resolve) {
+              axios.post(refreshUrl, payload, {
+                headers: {
+                  "Content-Type": config.refreshTokenEndpoint ? "application/x-www-form-urlencoded" : "multipart/form-data",
+                  Authorization: `Bearer ${accessTokenExp}`
+                }
+              }).then(async (res) => {
+                const data = res.data;
+                await localStorage2.setToken(data.access_token);
+                await localStorage2.setRefreshToken(data.refresh_token);
+                axios.defaults.headers.common["Authorization"] = "Bearer " + data.access_token;
+                originalRequest.headers["Authorization"] = "Bearer " + data.access_token;
+                originalRequest.data = updateTokenParamInOriginalRequest(
+                  originalRequest,
+                  data.access_token
+                );
+                processQueue(null, data.access_token);
+                resolve(instance.request(originalRequest));
+              }).catch(async (err) => {
+                if (err && (err?.error_code === "AUTHEN_FAIL" || err?.error_code === "TOKEN_EXPIRED" || err?.error_code === "TOKEN_INCORRECT" || err?.code === "ERR_2FA_006")) {
+                  await clearAuthToken();
+                }
+                if (err && err.response) {
+                  const { error_code } = err.response?.data || {};
+                  const { code } = err;
+                  if (error_code === "AUTHEN_FAIL" || code === "ERR_2FA_006") {
+                    await clearAuthToken();
+                  }
+                }
+                processQueue(err, null);
+              }).finally(() => {
+                isRefreshing = false;
+              });
+            });
+          }
+        }
+        return Promise.reject(await handleError3(error));
+      }
+    );
     instance.interceptors.response.use(
       (response) => {
         return handleResponse(response);
@@ -5913,7 +6006,6 @@ var axiosClient = {
         if ((error.response?.status === 403 || error.response?.status === 401 || error.response?.status === 404) && ["TOKEN_EXPIRED", "AUTHEN_FAIL", 401, "ERR_2FA_006"].includes(
           error.response.data.code
         )) {
-          console.log("isRefreshing", isRefreshing);
           if (isRefreshing) {
             return new Promise(function(resolve, reject) {
               failedQueue.push({ resolve, reject });
@@ -5935,7 +6027,6 @@ var axiosClient = {
           const accessTokenExp = await localStorage2.getAccessToken();
           isRefreshing = true;
           if (!refreshToken && (!browserSession || browserSession == "unActive")) {
-            console.log("222");
             await clearAuthToken();
           } else {
             const payload = Object.fromEntries(
@@ -5946,7 +6037,6 @@ var axiosClient = {
                 client_secret: config.config.clientSecret
               }).filter(([_, value]) => !!value)
             );
-            console.log("111");
             return new Promise(function(resolve) {
               axios.post(
                 `${config?.baseUrl}${config.refreshTokenEndpoint ?? "/authentication/oauth2/token" /* AUTH_TOKEN_PATH */}`,

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@fctc/interface-logic",
-  "version": "3.8.9",
+  "version": "3.8.10",
   "types": "dist/index.d.ts",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",