@fctc/interface-logic 1.2.0 → 1.2.2

package/dist/provider.mjs

@@ -2763,6 +2763,25 @@ function matchDomain(record, domain) {
 
 // src/utils/function.ts
 import { useEffect, useState } from "react";
+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 = () => {
@@ -2827,7 +2846,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;
         }
@@ -2853,7 +2873,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) {
@@ -2861,6 +2881,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)) {
@@ -2885,11 +2909,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}`
                   }
                 }
@@ -2899,10 +2923,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) {
@@ -2952,7 +2980,7 @@ var axiosClient = {
     const responseBody = (response) => response;
     const requests = {
       get: (url, headers) => instance.get(formatUrl(url, db), headers).then(responseBody),
-      post: (url, body, headers) => instance.post(formatUrl(url, db), body, { headers }).then(responseBody),
+      post: (url, body, headers) => instance.post(formatUrl(url, db), body, headers).then(responseBody),
       post_excel: (url, body, headers) => instance.post(formatUrl(url, db), body, {
         responseType: "arraybuffer",
         headers: {
@@ -2981,6 +3009,7 @@ var EnvStore = class {
   db;
   localStorageUtils;
   sessionStorageUtils;
+  refreshTokenEndpoint;
   constructor(envStore2, localStorageUtils2, sessionStorageUtils2) {
     this.envStore = envStore2;
     this.localStorageUtils = localStorageUtils2;
@@ -2997,6 +3026,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;
@@ -3332,14 +3362,18 @@ var ViewService = {
   async verify2FA({
     method,
     with_context,
-    code
+    code,
+    device,
+    location
   }) {
     const env2 = getEnv();
     const jsonData = {
       method,
       kwargs: {
         vals: {
-          code
+          code,
+          device,
+          location
         }
       },
       with_context
@@ -3347,7 +3381,8 @@ var ViewService = {
     return env2?.requests.post("/call" /* CALL_PATH */, jsonData, {
       headers: {
         "Content-Type": "application/json"
-      }
+      },
+      withCredentials: true
     });
   },
   async signInSSO({
@@ -3366,7 +3401,120 @@ var ViewService = {
     });
     const url = `${path}?${params.toString()}`;
     return env2?.requests.get(url, {
-      credentials: "include",
+      headers: {
+        "Content-Type": "application/json"
+      },
+      withCredentials: true
+    });
+  },
+  async grantAccess({
+    redirect_uri,
+    state,
+    client_id,
+    scopes
+  }) {
+    const env2 = getEnv();
+    const jsonData = {
+      redirect_uri,
+      state,
+      client_id,
+      scopes
+    };
+    return env2?.requests.post("/grant-access" /* GRANT_ACCESS */, jsonData, {
+      headers: {
+        "Content-Type": "application/json"
+      },
+      withCredentials: true
+    });
+  },
+  async getFieldsViewSecurity({
+    method,
+    token,
+    views
+  }) {
+    const env2 = getEnv();
+    const jsonData = {
+      method,
+      kwargs: {
+        views
+      },
+      with_context: {
+        token
+      }
+    };
+    return env2?.requests.post("/call" /* CALL_PATH */, jsonData, {
+      headers: {
+        "Content-Type": "application/json"
+      }
+    });
+  },
+  async settingsWebRead2fa({
+    method,
+    model,
+    kwargs,
+    token
+  }) {
+    const env2 = getEnv();
+    const jsonData = {
+      method,
+      model,
+      kwargs,
+      with_context: {
+        token
+      }
+    };
+    return env2?.requests.post("/call" /* CALL_PATH */, jsonData, {
+      headers: {
+        "Content-Type": "application/json"
+      }
+    });
+  },
+  async requestSetupTotp({ method, token }) {
+    const env2 = getEnv();
+    const jsonData = {
+      method,
+      with_context: {
+        token
+      }
+    };
+    return env2?.requests.post("/call" /* CALL_PATH */, jsonData, {
+      headers: {
+        "Content-Type": "application/json"
+      }
+    });
+  },
+  async verifyTotp({
+    method,
+    action_token,
+    code
+  }) {
+    const env2 = getEnv();
+    const jsonData = {
+      method,
+      kwargs: {
+        vals: {
+          code
+        }
+      },
+      with_context: {
+        action_token
+      }
+    };
+    return env2?.requests.post("/call" /* CALL_PATH */, jsonData, {
+      headers: {
+        "Content-Type": "application/json"
+      }
+    });
+  },
+  async removeTotpSetUp({ method, token }) {
+    const env2 = getEnv();
+    const jsonData = {
+      method,
+      with_context: {
+        token
+      }
+    };
+    return env2?.requests.post("/call" /* CALL_PATH */, jsonData, {
       headers: {
         "Content-Type": "application/json"
       }

package/dist/services.d.mts

@@ -60,6 +60,8 @@ declare const AuthService: {
         access_token: string;
     }): Promise<any>;
     getProviders(db?: string): Promise<any>;
+    getAccessByCode(code: string): Promise<any>;
+    logout(data: string): Promise<any>;
 };
 
 declare const CompanyService: {
@@ -180,7 +182,7 @@ declare const ModelService: {
 };
 
 declare const UserService: {
-    getProfile(): Promise<any>;
+    getProfile(path?: string): Promise<any>;
     getUser({ context, id }: {
         context: any;
         id: any;
@@ -207,10 +209,12 @@ declare const ViewService: {
         method: string;
         with_context: any;
     }): Promise<any>;
-    verify2FA({ method, with_context, code, }: {
+    verify2FA({ method, with_context, code, device, location, }: {
         method: string;
         with_context: any;
         code: string;
+        device: string;
+        location: string;
     }): Promise<any>;
     signInSSO({ redirect_uri, state, client_id, response_type, path, }: {
         redirect_uri: string;
@@ -219,6 +223,36 @@ declare const ViewService: {
         response_type: string;
         path: string;
     }): Promise<any>;
+    grantAccess({ redirect_uri, state, client_id, scopes, }: {
+        redirect_uri: string;
+        state: string;
+        client_id: string;
+        scopes: string[];
+    }): Promise<any>;
+    getFieldsViewSecurity({ method, token, views, }: {
+        method: string;
+        token: string;
+        views: any;
+    }): Promise<any>;
+    settingsWebRead2fa({ method, model, kwargs, token, }: {
+        method: string;
+        token: string;
+        kwargs: any;
+        model: string;
+    }): Promise<any>;
+    requestSetupTotp({ method, token }: {
+        method: string;
+        token: string;
+    }): Promise<any>;
+    verifyTotp({ method, action_token, code, }: {
+        method: string;
+        action_token: string;
+        code: string;
+    }): Promise<any>;
+    removeTotpSetUp({ method, token }: {
+        method: string;
+        token: string;
+    }): Promise<any>;
 };
 
 export { ActionService, AuthService, CompanyService, ExcelService, FormService, KanbanServices as KanbanService, ModelService, UserService, ViewService };

package/dist/services.d.ts

@@ -60,6 +60,8 @@ declare const AuthService: {
         access_token: string;
     }): Promise<any>;
     getProviders(db?: string): Promise<any>;
+    getAccessByCode(code: string): Promise<any>;
+    logout(data: string): Promise<any>;
 };
 
 declare const CompanyService: {
@@ -180,7 +182,7 @@ declare const ModelService: {
 };
 
 declare const UserService: {
-    getProfile(): Promise<any>;
+    getProfile(path?: string): Promise<any>;
     getUser({ context, id }: {
         context: any;
         id: any;
@@ -207,10 +209,12 @@ declare const ViewService: {
         method: string;
         with_context: any;
     }): Promise<any>;
-    verify2FA({ method, with_context, code, }: {
+    verify2FA({ method, with_context, code, device, location, }: {
         method: string;
         with_context: any;
         code: string;
+        device: string;
+        location: string;
     }): Promise<any>;
     signInSSO({ redirect_uri, state, client_id, response_type, path, }: {
         redirect_uri: string;
@@ -219,6 +223,36 @@ declare const ViewService: {
         response_type: string;
         path: string;
     }): Promise<any>;
+    grantAccess({ redirect_uri, state, client_id, scopes, }: {
+        redirect_uri: string;
+        state: string;
+        client_id: string;
+        scopes: string[];
+    }): Promise<any>;
+    getFieldsViewSecurity({ method, token, views, }: {
+        method: string;
+        token: string;
+        views: any;
+    }): Promise<any>;
+    settingsWebRead2fa({ method, model, kwargs, token, }: {
+        method: string;
+        token: string;
+        kwargs: any;
+        model: string;
+    }): Promise<any>;
+    requestSetupTotp({ method, token }: {
+        method: string;
+        token: string;
+    }): Promise<any>;
+    verifyTotp({ method, action_token, code, }: {
+        method: string;
+        action_token: string;
+        code: string;
+    }): Promise<any>;
+    removeTotpSetUp({ method, token }: {
+        method: string;
+        token: string;
+    }): Promise<any>;
 };
 
 export { ActionService, AuthService, CompanyService, ExcelService, FormService, KanbanServices as KanbanService, ModelService, UserService, ViewService };