@fctc/interface-logic 1.8.3 → 1.8.5

package/dist/services.mjs

@@ -2207,9 +2207,9 @@ var sessionStorageUtils = () => {
 // src/configs/axios-client.ts
 var axiosClient = {
   init(config) {
-    const localStorage2 = config.localStorageUtils ?? localStorageUtils();
-    const sessionStorage2 = config.sessionStorageUtils ?? sessionStorageUtils();
-    const db = config.db;
+    const localStorage2 = config?.localStorageUtils ?? localStorageUtils();
+    const sessionStorage2 = config?.sessionStorageUtils ?? sessionStorageUtils();
+    const db = config?.db;
     let isRefreshing = false;
     let failedQueue = [];
     const processQueue = (error, token = null) => {
@@ -2228,16 +2228,19 @@ var axiosClient = {
       timeout: 5e4,
       paramsSerializer: (params) => new URLSearchParams(params).toString()
     });
-    instance.interceptors.request.use(async (config2) => {
-      const { useRefreshToken, useActionToken, actionToken } = config2;
-      if (useActionToken && actionToken) {
-        config2.headers["Action-Token"] = actionToken;
-      }
-      const getToken = useRefreshToken ? localStorage2.getRefreshToken : localStorage2.getAccessToken;
-      const token = await getToken?.();
-      if (token) config2.headers["Authorization"] = `Bearer ${token}`;
-      return config2;
-    }, Promise.reject);
+    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);
@@ -2992,83 +2995,73 @@ var envStore = configureStore({
 });
 
 // src/environment/EnvStore.ts
-var EnvStore = class {
-  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();
-  }
-  setup() {
-    const env2 = this.envStore.getState().env;
-    this.baseUrl = env2?.baseUrl;
-    this.requests = env2?.requests;
-    this.context = env2?.context;
-    this.defaultCompany = env2?.defaultCompany;
-    this.config = env2?.config;
-    this.companies = env2?.companies || [];
-    this.user = env2?.user;
-    this.db = env2?.db;
-    this.refreshTokenEndpoint = env2?.refreshTokenEndpoint;
-  }
-  setupEnv(envConfig) {
-    const dispatch = this.envStore.dispatch;
-    const env2 = {
+function createEnvStore(store, localStorageUtil, sessionStorageUtil) {
+  const getEnvState = () => store.getState().env;
+  const setupEnvConfig = () => {
+    const env2 = getEnvState();
+    return {
+      baseUrl: env2?.baseUrl,
+      requests: env2?.requests,
+      context: env2?.context,
+      defaultCompany: env2?.defaultCompany,
+      config: env2?.config,
+      companies: env2?.companies || [],
+      user: env2?.user,
+      db: env2?.db,
+      refreshTokenEndpoint: env2?.refreshTokenEndpoint
+    };
+  };
+  const setupEnv = (envConfig) => {
+    const dispatch = store.dispatch;
+    const updatedEnv = {
       ...envConfig,
-      localStorageUtils: this.localStorageUtils,
-      sessionStorageUtils: this.sessionStorageUtils
+      localStorageUtils: localStorageUtil,
+      sessionStorageUtils: sessionStorageUtil
     };
-    const requests = axiosClient.init(env2);
-    dispatch(setEnv({ ...env2, 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();
-  }
-};
+    const requests = axiosClient.init(updatedEnv);
+    dispatch(setEnv({ ...updatedEnv, requests }));
+    return setupEnvConfig();
+  };
+  const setupUid = (uid) => {
+    store.dispatch(setUid(uid));
+    return setupEnvConfig();
+  };
+  const setupLang = (lang) => {
+    store.dispatch(setLang(lang));
+    return setupEnvConfig();
+  };
+  const setupAllowCompanies = (allowCompanies) => {
+    store.dispatch(setAllowCompanies(allowCompanies));
+    return setupEnvConfig();
+  };
+  const setupCompanies = (companies) => {
+    store.dispatch(setCompanies(companies));
+    return setupEnvConfig();
+  };
+  const setupDefaultCompany = (company) => {
+    store.dispatch(setDefaultCompany(company));
+    return setupEnvConfig();
+  };
+  const setUserInfo = (userInfo) => {
+    store.dispatch(setUser(userInfo));
+    return setupEnvConfig();
+  };
+  return {
+    getEnvConfig: setupEnvConfig,
+    setupEnv,
+    setUid: setupUid,
+    setLang: setupLang,
+    setAllowCompanies: setupAllowCompanies,
+    setCompanies: setupCompanies,
+    setDefaultCompany: setupDefaultCompany,
+    setUserInfo
+  };
+}
 var env = null;
 function getEnv() {
-  if (!env)
-    env = new EnvStore(envStore, localStorageUtils(), sessionStorageUtils());
+  if (!env) {
+    env = createEnvStore(envStore, localStorageUtils(), sessionStorageUtils());
+  }
   return env;
 }
 
@@ -3334,20 +3327,6 @@ var AuthService = {
       }
     });
   },
-  async isValidActionToken(actionToken, path) {
-    const env2 = getEnv();
-    return env2?.requests?.post(
-      path,
-      {},
-      {
-        headers: {
-          "Content-Type": "application/json"
-        },
-        useActionToken: true,
-        actionToken
-      }
-    );
-  },
   async loginSocial({
     db,
     state,
@@ -4112,7 +4091,7 @@ var model_service_default = ModelService;
 var UserService = {
   async getProfile(path) {
     const env2 = getEnv();
-    return env2?.requests?.get(path ?? "/userinfo" /* PROFILE_PATH */, {
+    return env2.requests.get(path ?? "/userinfo" /* PROFILE_PATH */, {
       headers: {
         "Content-Type": "application/x-www-form-urlencoded"
       }
@@ -4431,8 +4410,8 @@ var ViewService = {
   },
   async getVersion() {
     const env2 = getEnv();
-    console.log("env", env2);
-    return env2?.requests.get("", {
+    console.log("env?.requests", env2, env2?.requests);
+    return env2?.requests?.get("", {
       headers: {
         "Content-Type": "application/json"
       }

package/dist/session-storage-ARp_lhTD.d.mts

@@ -0,0 +1,15 @@
+declare const localStorageUtils: () => {
+    setToken: (access_token: string) => Promise<void>;
+    setRefreshToken: (refresh_token: string) => Promise<void>;
+    getAccessToken: () => Promise<string | null>;
+    getRefreshToken: () => Promise<string | null>;
+    clearToken: () => Promise<void>;
+};
+type LocalStorageUtilsType = ReturnType<typeof localStorageUtils>;
+
+declare const sessionStorageUtils: () => {
+    getBrowserSession: () => Promise<string | null>;
+};
+type SessionStorageUtilsType = ReturnType<typeof sessionStorageUtils>;
+
+export type { LocalStorageUtilsType as L, SessionStorageUtilsType as S };

package/dist/session-storage-ARp_lhTD.d.ts

@@ -0,0 +1,15 @@
+declare const localStorageUtils: () => {
+    setToken: (access_token: string) => Promise<void>;
+    setRefreshToken: (refresh_token: string) => Promise<void>;
+    getAccessToken: () => Promise<string | null>;
+    getRefreshToken: () => Promise<string | null>;
+    clearToken: () => Promise<void>;
+};
+type LocalStorageUtilsType = ReturnType<typeof localStorageUtils>;
+
+declare const sessionStorageUtils: () => {
+    getBrowserSession: () => Promise<string | null>;
+};
+type SessionStorageUtilsType = ReturnType<typeof sessionStorageUtils>;
+
+export type { LocalStorageUtilsType as L, SessionStorageUtilsType as S };

package/dist/store.d.mts

@@ -253,26 +253,7 @@ declare const setMenuList: _reduxjs_toolkit.ActionCreatorWithPayload<any, "navba
 declare const selectNavbar: (state: RootState) => NavbarStateType;
 
 declare const envStore: _reduxjs_toolkit.EnhancedStore<{
-    env: {
-        baseUrl: string;
-        requests: null;
-        companies: never[];
-        user: {};
-        config: null;
-        envFile: null;
-        defaultCompany: {
-            id: null;
-            logo: string;
-            secondary_color: string;
-            primary_color: string;
-        };
-        context: {
-            uid: null;
-            allowed_company_ids: never[];
-            lang: string;
-            tz: string;
-        };
-    };
+    env: any;
     header: {
         value: {
             allowedCompanyIds: never[];
@@ -288,26 +269,7 @@ declare const envStore: _reduxjs_toolkit.EnhancedStore<{
     profile: ProfileStateType;
 }, redux.UnknownAction, _reduxjs_toolkit.Tuple<[redux.StoreEnhancer<{
     dispatch: redux_thunk.ThunkDispatch<{
-        env: {
-            baseUrl: string;
-            requests: null;
-            companies: never[];
-            user: {};
-            config: null;
-            envFile: null;
-            defaultCompany: {
-                id: null;
-                logo: string;
-                secondary_color: string;
-                primary_color: string;
-            };
-            context: {
-                uid: null;
-                allowed_company_ids: never[];
-                lang: string;
-                tz: string;
-            };
-        };
+        env: any;
         header: {
             value: {
                 allowedCompanyIds: never[];
@@ -324,253 +286,44 @@ declare const envStore: _reduxjs_toolkit.EnhancedStore<{
     }, undefined, redux.UnknownAction>;
 }>, redux.StoreEnhancer]>>;
 
-declare const envSlice: _reduxjs_toolkit.Slice<{
-    baseUrl: string;
-    requests: null;
-    companies: never[];
-    user: {};
-    config: null;
-    envFile: null;
-    defaultCompany: {
-        id: null;
-        logo: string;
-        secondary_color: string;
-        primary_color: string;
-    };
-    context: {
-        uid: null;
-        allowed_company_ids: never[];
-        lang: string;
-        tz: string;
-    };
-}, {
-    setEnv: (state: immer.WritableDraft<{
-        baseUrl: string;
-        requests: null;
-        companies: never[];
-        user: {};
-        config: null;
-        envFile: null;
-        defaultCompany: {
-            id: null;
-            logo: string;
-            secondary_color: string;
-            primary_color: string;
-        };
-        context: {
-            uid: null;
-            allowed_company_ids: never[];
-            lang: string;
-            tz: string;
-        };
-    }>, action: {
+declare const envSlice: _reduxjs_toolkit.Slice<any, {
+    setEnv: (state: any, action: {
         payload: any;
         type: string;
     }) => void;
-    setUid: (state: immer.WritableDraft<{
-        baseUrl: string;
-        requests: null;
-        companies: never[];
-        user: {};
-        config: null;
-        envFile: null;
-        defaultCompany: {
-            id: null;
-            logo: string;
-            secondary_color: string;
-            primary_color: string;
-        };
-        context: {
-            uid: null;
-            allowed_company_ids: never[];
-            lang: string;
-            tz: string;
-        };
-    }>, action: {
+    setUid: (state: any, action: {
         payload: any;
         type: string;
     }) => void;
-    setAllowCompanies: (state: immer.WritableDraft<{
-        baseUrl: string;
-        requests: null;
-        companies: never[];
-        user: {};
-        config: null;
-        envFile: null;
-        defaultCompany: {
-            id: null;
-            logo: string;
-            secondary_color: string;
-            primary_color: string;
-        };
-        context: {
-            uid: null;
-            allowed_company_ids: never[];
-            lang: string;
-            tz: string;
-        };
-    }>, action: {
+    setAllowCompanies: (state: any, action: {
         payload: any;
         type: string;
     }) => void;
-    setCompanies: (state: immer.WritableDraft<{
-        baseUrl: string;
-        requests: null;
-        companies: never[];
-        user: {};
-        config: null;
-        envFile: null;
-        defaultCompany: {
-            id: null;
-            logo: string;
-            secondary_color: string;
-            primary_color: string;
-        };
-        context: {
-            uid: null;
-            allowed_company_ids: never[];
-            lang: string;
-            tz: string;
-        };
-    }>, action: {
+    setCompanies: (state: any, action: {
         payload: any;
         type: string;
     }) => void;
-    setDefaultCompany: (state: immer.WritableDraft<{
-        baseUrl: string;
-        requests: null;
-        companies: never[];
-        user: {};
-        config: null;
-        envFile: null;
-        defaultCompany: {
-            id: null;
-            logo: string;
-            secondary_color: string;
-            primary_color: string;
-        };
-        context: {
-            uid: null;
-            allowed_company_ids: never[];
-            lang: string;
-            tz: string;
-        };
-    }>, action: {
+    setDefaultCompany: (state: any, action: {
         payload: any;
         type: string;
     }) => void;
-    setLang: (state: immer.WritableDraft<{
-        baseUrl: string;
-        requests: null;
-        companies: never[];
-        user: {};
-        config: null;
-        envFile: null;
-        defaultCompany: {
-            id: null;
-            logo: string;
-            secondary_color: string;
-            primary_color: string;
-        };
-        context: {
-            uid: null;
-            allowed_company_ids: never[];
-            lang: string;
-            tz: string;
-        };
-    }>, action: {
+    setLang: (state: any, action: {
         payload: any;
         type: string;
     }) => void;
-    setUser: (state: immer.WritableDraft<{
-        baseUrl: string;
-        requests: null;
-        companies: never[];
-        user: {};
-        config: null;
-        envFile: null;
-        defaultCompany: {
-            id: null;
-            logo: string;
-            secondary_color: string;
-            primary_color: string;
-        };
-        context: {
-            uid: null;
-            allowed_company_ids: never[];
-            lang: string;
-            tz: string;
-        };
-    }>, action: {
+    setUser: (state: any, action: {
         payload: any;
         type: string;
     }) => void;
-    setConfig: (state: immer.WritableDraft<{
-        baseUrl: string;
-        requests: null;
-        companies: never[];
-        user: {};
-        config: null;
-        envFile: null;
-        defaultCompany: {
-            id: null;
-            logo: string;
-            secondary_color: string;
-            primary_color: string;
-        };
-        context: {
-            uid: null;
-            allowed_company_ids: never[];
-            lang: string;
-            tz: string;
-        };
-    }>, action: {
+    setConfig: (state: any, action: {
         payload: any;
         type: string;
     }) => void;
-    setEnvFile: (state: immer.WritableDraft<{
-        baseUrl: string;
-        requests: null;
-        companies: never[];
-        user: {};
-        config: null;
-        envFile: null;
-        defaultCompany: {
-            id: null;
-            logo: string;
-            secondary_color: string;
-            primary_color: string;
-        };
-        context: {
-            uid: null;
-            allowed_company_ids: never[];
-            lang: string;
-            tz: string;
-        };
-    }>, action: {
+    setEnvFile: (state: any, action: {
         payload: any;
         type: string;
     }) => void;
-}, "env", "env", _reduxjs_toolkit.SliceSelectors<{
-    baseUrl: string;
-    requests: null;
-    companies: never[];
-    user: {};
-    config: null;
-    envFile: null;
-    defaultCompany: {
-        id: null;
-        logo: string;
-        secondary_color: string;
-        primary_color: string;
-    };
-    context: {
-        uid: null;
-        allowed_company_ids: never[];
-        lang: string;
-        tz: string;
-    };
-}>>;
+}, "env", "env", _reduxjs_toolkit.SliceSelectors<any>>;
 declare const setEnv: _reduxjs_toolkit.ActionCreatorWithPayload<any, "env/setEnv">;
 declare const setUid: _reduxjs_toolkit.ActionCreatorWithPayload<any, "env/setUid">;
 declare const setLang: _reduxjs_toolkit.ActionCreatorWithPayload<any, "env/setLang">;
@@ -580,26 +333,7 @@ declare const setDefaultCompany: _reduxjs_toolkit.ActionCreatorWithPayload<any,
 declare const setUser: _reduxjs_toolkit.ActionCreatorWithPayload<any, "env/setUser">;
 declare const setConfig: _reduxjs_toolkit.ActionCreatorWithPayload<any, "env/setConfig">;
 declare const setEnvFile: _reduxjs_toolkit.ActionCreatorWithPayload<any, "env/setEnvFile">;
-declare const selectEnv: (state: RootState) => {
-    baseUrl: string;
-    requests: null;
-    companies: never[];
-    user: {};
-    config: null;
-    envFile: null;
-    defaultCompany: {
-        id: null;
-        logo: string;
-        secondary_color: string;
-        primary_color: string;
-    };
-    context: {
-        uid: null;
-        allowed_company_ids: never[];
-        lang: string;
-        tz: string;
-    };
-};
+declare const selectEnv: (state: RootState) => any;
 
 declare const headerSlice: _reduxjs_toolkit.Slice<{
     value: {