@fctc/interface-logic 1.0.4 → 1.0.6

package/dist/model.js

@@ -60,6 +60,9 @@ var UriConstants = /* @__PURE__ */ ((UriConstants2) => {
   UriConstants2["CREATE_UPDATE_PATH"] = `/create_update`;
   UriConstants2["TWOFA_METHOD_PATH"] = `/id/api/v2/call`;
   UriConstants2["SIGNIN_SSO"] = `/signin-sso/oauth`;
+  UriConstants2["GRANT_ACCESS"] = "/grant-access";
+  UriConstants2["TOKEN_BY_CODE"] = "/token";
+  UriConstants2["LOGOUT"] = "/logout";
   return UriConstants2;
 })(UriConstants || {});
 
@@ -2294,6 +2297,27 @@ function matchDomain(record, domain) {
   return matchCondition(record, condStack.pop());
 }
 
+// src/utils/function.ts
+var updateTokenParamInOriginalRequest = (originalRequest, newAccessToken) => {
+  if (!originalRequest.data) return originalRequest.data;
+  if (typeof originalRequest.data === "string") {
+    try {
+      const parsedData = JSON.parse(originalRequest.data);
+      if (parsedData.with_context && typeof parsedData.with_context === "object") {
+        parsedData.with_context.token = newAccessToken;
+      }
+      return JSON.stringify(parsedData);
+    } catch (e) {
+      console.warn("Failed to parse originalRequest.data", e);
+      return originalRequest.data;
+    }
+  }
+  if (typeof originalRequest.data === "object" && originalRequest.data.with_context) {
+    originalRequest.data.with_context.token = newAccessToken;
+  }
+  return originalRequest.data;
+};
+
 // src/utils/storage/local-storage.ts
 var localStorageUtils = () => {
   const setToken = async (access_token) => {
@@ -2357,7 +2381,8 @@ var axiosClient = {
     });
     instance.interceptors.request.use(
       async (config2) => {
-        const token = await localStorage2.getAccessToken();
+        const useRefreshToken = config2.useRefreshToken;
+        const token = useRefreshToken ? await localStorage2.getRefreshToken() : await localStorage2.getAccessToken();
         if (token) {
           config2.headers["Authorization"] = "Bearer " + token;
         }
@@ -2383,7 +2408,7 @@ var axiosClient = {
           return data;
         };
         const originalRequest = error.config;
-        if ((error.response?.status === 403 || error.response?.status === 401 || error.response?.status === 404) && ["TOKEN_EXPIRED", "AUTHEN_FAIL", 401].includes(
+        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) {
@@ -2391,6 +2416,10 @@ var axiosClient = {
               failedQueue.push({ resolve, reject });
             }).then((token) => {
               originalRequest.headers["Authorization"] = "Bearer " + token;
+              originalRequest.data = updateTokenParamInOriginalRequest(
+                originalRequest,
+                token
+              );
               return instance.request(originalRequest);
             }).catch(async (err) => {
               if ((err.response?.status === 400 || err.response?.status === 401) && ["invalid_grant"].includes(err.response.data.error)) {
@@ -2415,11 +2444,11 @@ var axiosClient = {
             );
             return new Promise(function(resolve) {
               import_axios.default.post(
-                `${config.baseUrl}${"/authentication/oauth2/token" /* AUTH_TOKEN_PATH */}`,
+                `${config.baseUrl}${config.refreshTokenEndpoint ?? "/authentication/oauth2/token" /* AUTH_TOKEN_PATH */}`,
                 payload,
                 {
                   headers: {
-                    "Content-Type": "multipart/form-data",
+                    "Content-Type": config.refreshTokenEndpoint ? "application/x-www-form-urlencoded" : "multipart/form-data",
                     Authorization: `Bearer ${accessTokenExp}`
                   }
                 }
@@ -2429,10 +2458,14 @@ var axiosClient = {
                 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_BAD_REQUEST")) {
+                if (err && (err?.error_code === "AUTHEN_FAIL" || err?.error_code === "TOKEN_EXPIRED" || err?.error_code === "TOKEN_INCORRECT" || err?.code === "ERR_BAD_REQUEST") || err?.error_code === "ERR_2FA_006") {
                   await clearAuthToken();
                 }
                 if (err && err.response) {
@@ -3125,6 +3158,7 @@ var EnvStore = class {
   db;
   localStorageUtils;
   sessionStorageUtils;
+  refreshTokenEndpoint;
   constructor(envStore2, localStorageUtils2, sessionStorageUtils2) {
     this.envStore = envStore2;
     this.localStorageUtils = localStorageUtils2;
@@ -3141,6 +3175,7 @@ var EnvStore = class {
     this.companies = env2?.companies || [];
     this.user = env2?.user;
     this.db = env2?.db;
+    this.refreshTokenEndpoint = env2?.refreshTokenEndpoint;
   }
   setupEnv(envConfig) {
     const dispatch = this.envStore.dispatch;

package/dist/model.mjs

@@ -22,6 +22,9 @@ var UriConstants = /* @__PURE__ */ ((UriConstants2) => {
   UriConstants2["CREATE_UPDATE_PATH"] = `/create_update`;
   UriConstants2["TWOFA_METHOD_PATH"] = `/id/api/v2/call`;
   UriConstants2["SIGNIN_SSO"] = `/signin-sso/oauth`;
+  UriConstants2["GRANT_ACCESS"] = "/grant-access";
+  UriConstants2["TOKEN_BY_CODE"] = "/token";
+  UriConstants2["LOGOUT"] = "/logout";
   return UriConstants2;
 })(UriConstants || {});
 
@@ -2256,6 +2259,27 @@ function matchDomain(record, domain) {
   return matchCondition(record, condStack.pop());
 }
 
+// src/utils/function.ts
+var updateTokenParamInOriginalRequest = (originalRequest, newAccessToken) => {
+  if (!originalRequest.data) return originalRequest.data;
+  if (typeof originalRequest.data === "string") {
+    try {
+      const parsedData = JSON.parse(originalRequest.data);
+      if (parsedData.with_context && typeof parsedData.with_context === "object") {
+        parsedData.with_context.token = newAccessToken;
+      }
+      return JSON.stringify(parsedData);
+    } catch (e) {
+      console.warn("Failed to parse originalRequest.data", e);
+      return originalRequest.data;
+    }
+  }
+  if (typeof originalRequest.data === "object" && originalRequest.data.with_context) {
+    originalRequest.data.with_context.token = newAccessToken;
+  }
+  return originalRequest.data;
+};
+
 // src/utils/storage/local-storage.ts
 var localStorageUtils = () => {
   const setToken = async (access_token) => {
@@ -2319,7 +2343,8 @@ var axiosClient = {
     });
     instance.interceptors.request.use(
       async (config2) => {
-        const token = await localStorage2.getAccessToken();
+        const useRefreshToken = config2.useRefreshToken;
+        const token = useRefreshToken ? await localStorage2.getRefreshToken() : await localStorage2.getAccessToken();
         if (token) {
           config2.headers["Authorization"] = "Bearer " + token;
         }
@@ -2345,7 +2370,7 @@ var axiosClient = {
           return data;
         };
         const originalRequest = error.config;
-        if ((error.response?.status === 403 || error.response?.status === 401 || error.response?.status === 404) && ["TOKEN_EXPIRED", "AUTHEN_FAIL", 401].includes(
+        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) {
@@ -2353,6 +2378,10 @@ var axiosClient = {
               failedQueue.push({ resolve, reject });
             }).then((token) => {
               originalRequest.headers["Authorization"] = "Bearer " + token;
+              originalRequest.data = updateTokenParamInOriginalRequest(
+                originalRequest,
+                token
+              );
               return instance.request(originalRequest);
             }).catch(async (err) => {
               if ((err.response?.status === 400 || err.response?.status === 401) && ["invalid_grant"].includes(err.response.data.error)) {
@@ -2377,11 +2406,11 @@ var axiosClient = {
             );
             return new Promise(function(resolve) {
               axios.post(
-                `${config.baseUrl}${"/authentication/oauth2/token" /* AUTH_TOKEN_PATH */}`,
+                `${config.baseUrl}${config.refreshTokenEndpoint ?? "/authentication/oauth2/token" /* AUTH_TOKEN_PATH */}`,
                 payload,
                 {
                   headers: {
-                    "Content-Type": "multipart/form-data",
+                    "Content-Type": config.refreshTokenEndpoint ? "application/x-www-form-urlencoded" : "multipart/form-data",
                     Authorization: `Bearer ${accessTokenExp}`
                   }
                 }
@@ -2391,10 +2420,14 @@ var axiosClient = {
                 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_BAD_REQUEST")) {
+                if (err && (err?.error_code === "AUTHEN_FAIL" || err?.error_code === "TOKEN_EXPIRED" || err?.error_code === "TOKEN_INCORRECT" || err?.code === "ERR_BAD_REQUEST") || err?.error_code === "ERR_2FA_006") {
                   await clearAuthToken();
                 }
                 if (err && err.response) {
@@ -3087,6 +3120,7 @@ var EnvStore = class {
   db;
   localStorageUtils;
   sessionStorageUtils;
+  refreshTokenEndpoint;
   constructor(envStore2, localStorageUtils2, sessionStorageUtils2) {
     this.envStore = envStore2;
     this.localStorageUtils = localStorageUtils2;
@@ -3103,6 +3137,7 @@ var EnvStore = class {
     this.companies = env2?.companies || [];
     this.user = env2?.user;
     this.db = env2?.db;
+    this.refreshTokenEndpoint = env2?.refreshTokenEndpoint;
   }
   setupEnv(envConfig) {
     const dispatch = this.envStore.dispatch;

package/dist/provider.d.mts

@@ -1,15 +1,16 @@
+import * as react_jsx_runtime from 'react/jsx-runtime';
 import { ReactNode } from 'react';
 
 declare const MainProvider: ({ children }: {
     children: ReactNode;
-}) => JSX.Element;
+}) => react_jsx_runtime.JSX.Element;
 
 declare const ReactQueryProvider: ({ children }: {
     children: ReactNode;
-}) => JSX.Element;
+}) => react_jsx_runtime.JSX.Element;
 
 declare const VersionGate: ({ children }: {
     children: ReactNode;
-}) => JSX.Element | null;
+}) => react_jsx_runtime.JSX.Element | null;
 
 export { MainProvider, ReactQueryProvider, VersionGate };

package/dist/provider.d.ts

@@ -1,15 +1,16 @@
+import * as react_jsx_runtime from 'react/jsx-runtime';
 import { ReactNode } from 'react';
 
 declare const MainProvider: ({ children }: {
     children: ReactNode;
-}) => JSX.Element;
+}) => react_jsx_runtime.JSX.Element;
 
 declare const ReactQueryProvider: ({ children }: {
     children: ReactNode;
-}) => JSX.Element;
+}) => react_jsx_runtime.JSX.Element;
 
 declare const VersionGate: ({ children }: {
     children: ReactNode;
-}) => JSX.Element | null;
+}) => react_jsx_runtime.JSX.Element | null;
 
 export { MainProvider, ReactQueryProvider, VersionGate };