@fctc/interface-logic 1.7.4 → 1.7.6

package/dist/provider.mjs

@@ -43,25 +43,11 @@ var breadcrums_slice_default = breadcrumbsSlice.reducer;
 import { createSlice as createSlice2 } from "@reduxjs/toolkit";
 var initialState2 = {
   baseUrl: "",
+  requests: null,
   companies: [],
   user: {},
-  db: "",
-  refreshTokenEndpoint: "",
-  config: {
-    grantType: "",
-    clientId: "",
-    clientSecret: "",
-    redirectUri: ""
-  },
+  config: null,
   envFile: null,
-  requests: {
-    get: async (url, headers) => ({}),
-    post: async (url, body, headers) => ({}),
-    post_excel: async (url, body, headers) => ({}),
-    put: async (url, body, headers) => ({}),
-    patch: async (url, body) => ({}),
-    delete: async (url, body) => ({})
-  },
   defaultCompany: {
     id: null,
     logo: "",
@@ -2777,11 +2763,333 @@ 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 = () => {
+  const setToken = async (access_token) => {
+    localStorage.setItem("accessToken", access_token);
+  };
+  const setRefreshToken = async (refresh_token) => {
+    localStorage.setItem("refreshToken", refresh_token);
+  };
+  const getAccessToken = async () => {
+    return localStorage.getItem("accessToken");
+  };
+  const getRefreshToken = async () => {
+    return localStorage.getItem("refreshToken");
+  };
+  const clearToken = async () => {
+    localStorage.removeItem("accessToken");
+    localStorage.removeItem("refreshToken");
+  };
+  return {
+    setToken,
+    setRefreshToken,
+    getAccessToken,
+    getRefreshToken,
+    clearToken
+  };
+};
+
+// src/utils/storage/session-storage.ts
+var sessionStorageUtils = () => {
+  const getBrowserSession = async () => {
+    return sessionStorage.getItem("browserSession");
+  };
+  return {
+    getBrowserSession
+  };
+};
+
+// src/configs/axios-client.ts
+var axiosClient = {
+  init(config) {
+    const localStorage2 = config.localStorageUtils ?? localStorageUtils();
+    const sessionStorage2 = config.sessionStorageUtils ?? sessionStorageUtils();
+    const db = config.db;
+    let isRefreshing = false;
+    let failedQueue = [];
+    const processQueue = (error, token = null) => {
+      failedQueue?.forEach((prom) => {
+        if (error) {
+          prom.reject(error);
+        } else {
+          prom.resolve(token);
+        }
+      });
+      failedQueue = [];
+    };
+    const instance = axios.create({
+      adapter: axios.defaults.adapter,
+      baseURL: config.baseUrl,
+      timeout: 5e4,
+      paramsSerializer: (params) => new URLSearchParams(params).toString()
+    });
+    instance.interceptors.request.use(
+      async (config2) => {
+        const useRefreshToken = config2.useRefreshToken;
+        const token = useRefreshToken ? await localStorage2.getRefreshToken() : await localStorage2.getAccessToken();
+        if (token) {
+          config2.headers["Authorization"] = "Bearer " + token;
+        }
+        return config2;
+      },
+      (error) => {
+        Promise.reject(error);
+      }
+    );
+    instance.interceptors.response.use(
+      (response) => {
+        return handleResponse(response);
+      },
+      async (error) => {
+        const handleError3 = async (error2) => {
+          if (!error2.response) {
+            return error2;
+          }
+          const { data } = error2.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((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)) {
+                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(([_, value]) => !!value)
+            );
+            return new Promise(function(resolve) {
+              axios.post(
+                `${config.baseUrl}${config.refreshTokenEndpoint ?? "/authentication/oauth2/token" /* AUTH_TOKEN_PATH */}`,
+                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_BAD_REQUEST") || err?.error_code === "ERR_2FA_006") {
+                  await clearAuthToken();
+                }
+                if (err && err.response) {
+                  const { error_code } = err.response?.data || {};
+                  if (error_code === "AUTHEN_FAIL") {
+                    await clearAuthToken();
+                  }
+                }
+                processQueue(err, null);
+              }).finally(() => {
+                isRefreshing = false;
+              });
+            });
+          }
+        }
+        return Promise.reject(await handleError3(error));
+      }
+    );
+    const handleResponse = (res) => {
+      if (res && res.data) {
+        return res.data;
+      }
+      return res;
+    };
+    const handleError2 = (error) => {
+      if (error.isAxiosError && error.code === "ECONNABORTED") {
+        console.error("Request Timeout Error:", error);
+        return "Request Timeout Error";
+      } else if (error.isAxiosError && !error.response) {
+        console.error("Network Error:", error);
+        return "Network Error";
+      } else {
+        console.error("Other Error:", error?.response);
+        const errorMessage = error?.response?.data?.message || "An error occurred";
+        return { message: errorMessage, status: error?.response?.status };
+      }
+    };
+    const clearAuthToken = async () => {
+      await localStorage2.clearToken();
+      if (typeof window !== "undefined") {
+        window.location.href = `/login`;
+      }
+    };
+    function formatUrl(url, db2) {
+      return url + (db2 ? "?db=" + db2 : "");
+    }
+    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_excel: (url, body, headers) => instance.post(formatUrl(url, db), body, {
+        responseType: "arraybuffer",
+        headers: {
+          "Content-Type": typeof window !== "undefined" ? "application/json" : "application/javascript",
+          Accept: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+        }
+      }).then(responseBody),
+      put: (url, body, headers) => instance.put(formatUrl(url, db), body, headers).then(responseBody),
+      patch: (url, body) => instance.patch(formatUrl(url, db), body).then(responseBody),
+      delete: (url, body) => instance.delete(formatUrl(url, db), body).then(responseBody)
+    };
+    return requests;
+  }
+};
 
 // src/environment/EnvStore.ts
+var EnvStore = class _EnvStore {
+  static instance = null;
+  envStore;
+  baseUrl;
+  requests;
+  context;
+  defaultCompany;
+  config;
+  companies;
+  user;
+  db;
+  localStorageUtils;
+  sessionStorageUtils;
+  refreshTokenEndpoint;
+  constructor(envStore2, localStorageUtils2, sessionStorageUtils2) {
+    this.envStore = envStore2;
+    this.localStorageUtils = localStorageUtils2;
+    this.sessionStorageUtils = sessionStorageUtils2;
+    this.setup();
+  }
+  static getInstance(envStore2, localStorageUtils2, sessionStorageUtils2) {
+    if (!_EnvStore.instance) {
+      console.log("Creating new EnvStore instance");
+      _EnvStore.instance = new _EnvStore(envStore2, localStorageUtils2, sessionStorageUtils2);
+    } else {
+      console.log("Returning existing EnvStore instance");
+    }
+    return _EnvStore.instance;
+  }
+  setup() {
+    const env = this.envStore.getState().env;
+    console.log("Redux env state in A1:", env);
+    this.baseUrl = env?.baseUrl;
+    this.requests = env?.requests;
+    this.context = env?.context;
+    this.defaultCompany = env?.defaultCompany;
+    this.config = env?.config;
+    this.companies = env?.companies || [];
+    this.user = env?.user;
+    this.db = env?.db;
+    this.refreshTokenEndpoint = env?.refreshTokenEndpoint;
+    console.log("Env setup in A1:", this);
+  }
+  setupEnv(envConfig) {
+    const dispatch = this.envStore.dispatch;
+    const env = {
+      ...envConfig,
+      localStorageUtils: this.localStorageUtils,
+      sessionStorageUtils: this.sessionStorageUtils
+    };
+    console.log("Setting up env with config:", envConfig);
+    const requests = axiosClient.init(env);
+    console.log("axiosClient.init result:", requests);
+    dispatch(setEnv({ ...env, requests }));
+    this.setup();
+  }
+  setUid(uid) {
+    const dispatch = this.envStore.dispatch;
+    dispatch(setUid(uid));
+    this.setup();
+  }
+  setLang(lang) {
+    const dispatch = this.envStore.dispatch;
+    dispatch(setLang(lang));
+    this.setup();
+  }
+  setAllowCompanies(allowCompanies) {
+    const dispatch = this.envStore.dispatch;
+    dispatch(setAllowCompanies(allowCompanies));
+    this.setup();
+  }
+  setCompanies(companies) {
+    const dispatch = this.envStore.dispatch;
+    dispatch(setCompanies(companies));
+    this.setup();
+  }
+  setDefaultCompany(company) {
+    const dispatch = this.envStore.dispatch;
+    dispatch(setDefaultCompany(company));
+    this.setup();
+  }
+  setUserInfo(userInfo) {
+    const dispatch = this.envStore.dispatch;
+    dispatch(setUser(userInfo));
+    this.setup();
+  }
+};
 function getEnv() {
-  console.log("getEnv", envStore.getState().env);
-  return envStore.getState().env;
+  const instance = EnvStore.getInstance(envStore);
+  if (!instance) {
+    throw new Error("EnvStore has not been initialized \u2014 call initEnv() first");
+  }
+  return instance;
 }
 
 // src/services/view-service/index.ts
@@ -3045,7 +3353,8 @@ var ViewService = {
   },
   async getVersion() {
     const env = getEnv();
-    return env?.requests.get("", {
+    console.log("env?.requests", env, env?.requests);
+    return env?.requests?.get("", {
       headers: {
         "Content-Type": "application/json"
       }
@@ -3242,6 +3551,7 @@ var VersionGate = ({ children }) => {
     };
     const validateVersion = async () => {
       const serverVersion = await view_service_default.getVersion();
+      console.log("serverVersion", serverVersion);
       const cached = localStorage.getItem("__api_version__");
       if (cached !== serverVersion?.api_version) {
         clearVersion();

package/dist/services.d.mts

@@ -1,4 +1,4 @@
-import { C as ContextApi, L as LoginCredentialBody, R as ResetPasswordRequest, U as UpdatePasswordRequest, b as GetListParams, c as GetDetailParams, d as SaveParams, D as DeleteParams, O as OnChangeParams, V as ViewData, a as GetViewParams, G as GetSelectionType } from './view-type-D8ukwj_2.mjs';
+import { C as ContextApi, L as LoginCredentialBody, R as ResetPasswordRequest, U as UpdatePasswordRequest, b as GetListParams, a as GetDetailParams, S as SaveParams, D as DeleteParams, O as OnChangeParams, V as ViewData, f as GetViewParams, c as GetSelectionType } from './view-type-BGJfDe73.mjs';
 
 declare const ActionService: {
     loadAction({ idAction, context, }: {
@@ -51,7 +51,6 @@ declare const AuthService: {
     }): Promise<any>;
     updatePassword(data: UpdatePasswordRequest, token: string | null): Promise<any>;
     isValidToken(token: string | null): Promise<any>;
-    isValidActionToken(actionToken: string | null, path: string): Promise<any>;
     loginSocial({ db, state, access_token, }: {
         db: string;
         state: object;

package/dist/services.d.ts

@@ -1,4 +1,4 @@
-import { C as ContextApi, L as LoginCredentialBody, R as ResetPasswordRequest, U as UpdatePasswordRequest, b as GetListParams, c as GetDetailParams, d as SaveParams, D as DeleteParams, O as OnChangeParams, V as ViewData, a as GetViewParams, G as GetSelectionType } from './view-type-D8ukwj_2.js';
+import { C as ContextApi, L as LoginCredentialBody, R as ResetPasswordRequest, U as UpdatePasswordRequest, b as GetListParams, a as GetDetailParams, S as SaveParams, D as DeleteParams, O as OnChangeParams, V as ViewData, f as GetViewParams, c as GetSelectionType } from './view-type-BGJfDe73.js';
 
 declare const ActionService: {
     loadAction({ idAction, context, }: {
@@ -51,7 +51,6 @@ declare const AuthService: {
     }): Promise<any>;
     updatePassword(data: UpdatePasswordRequest, token: string | null): Promise<any>;
     isValidToken(token: string | null): Promise<any>;
-    isValidActionToken(actionToken: string | null, path: string): Promise<any>;
     loginSocial({ db, state, access_token, }: {
         db: string;
         state: object;