@fctc/interface-logic 1.7.1 → 1.7.3

package/dist/provider.mjs

@@ -43,13 +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: null,
   envFile: null,
-  requests: null,
   defaultCompany: {
     id: null,
     logo: "",
@@ -2846,16 +2844,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);
@@ -2996,7 +2997,9 @@ var axiosClient = {
 };
 
 // src/environment/EnvStore.ts
-var EnvStore = class {
+var EnvStore = class _EnvStore {
+  static instance = null;
+  envStore;
   baseUrl;
   requests;
   context;
@@ -3008,76 +3011,83 @@ var EnvStore = class {
   localStorageUtils;
   sessionStorageUtils;
   refreshTokenEndpoint;
-  constructor(localStorageUtils2, sessionStorageUtils2) {
+  constructor(envStore2, localStorageUtils2, sessionStorageUtils2) {
+    this.envStore = envStore2;
     this.localStorageUtils = localStorageUtils2;
     this.sessionStorageUtils = sessionStorageUtils2;
     this.setup();
   }
+  static getInstance(envStore2, localStorageUtils2, sessionStorageUtils2) {
+    if (!_EnvStore.instance) {
+      _EnvStore.instance = new _EnvStore(
+        envStore2,
+        localStorageUtils2,
+        sessionStorageUtils2
+      );
+    }
+    return _EnvStore.instance;
+  }
   setup() {
-    const env2 = envStore.getState().env;
-    this.baseUrl = env2?.baseUrl;
-    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.requests = env2?.requests;
-    this.refreshTokenEndpoint = env2?.refreshTokenEndpoint;
+    const env = this.envStore.getState().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:", this);
   }
   setupEnv(envConfig) {
-    let env2 = {
+    const dispatch = this.envStore.dispatch;
+    const env = {
       ...envConfig,
       localStorageUtils: this.localStorageUtils,
       sessionStorageUtils: this.sessionStorageUtils
     };
-    const requests = axiosClient.init(env2);
-    this.requests = requests;
-    const dispatch = envStore.dispatch;
-    dispatch(
-      setEnv({
-        ...env2,
-        requests
-      })
-    );
+    const requests = axiosClient.init(env);
+    dispatch(setEnv({ ...env, requests }));
     this.setup();
-    return { ...env2, requests };
   }
   setUid(uid) {
-    const dispatch = envStore.dispatch;
+    const dispatch = this.envStore.dispatch;
     dispatch(setUid(uid));
     this.setup();
   }
   setLang(lang) {
-    const dispatch = envStore.dispatch;
+    const dispatch = this.envStore.dispatch;
     dispatch(setLang(lang));
     this.setup();
   }
   setAllowCompanies(allowCompanies) {
-    const dispatch = envStore.dispatch;
+    const dispatch = this.envStore.dispatch;
     dispatch(setAllowCompanies(allowCompanies));
     this.setup();
   }
   setCompanies(companies) {
-    const dispatch = envStore.dispatch;
+    const dispatch = this.envStore.dispatch;
     dispatch(setCompanies(companies));
     this.setup();
   }
   setDefaultCompany(company) {
-    const dispatch = envStore.dispatch;
+    const dispatch = this.envStore.dispatch;
     dispatch(setDefaultCompany(company));
     this.setup();
   }
   setUserInfo(userInfo) {
-    const dispatch = envStore.dispatch;
+    const dispatch = this.envStore.dispatch;
     dispatch(setUser(userInfo));
     this.setup();
   }
 };
-var env = null;
 function getEnv() {
-  if (!env) env = new EnvStore(localStorageUtils(), sessionStorageUtils());
-  return 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
@@ -3089,7 +3099,7 @@ var ViewService = {
     options = {},
     aid
   }) {
-    const env2 = getEnv();
+    const env = getEnv();
     const defaultOptions = {
       load_filters: true,
       toolbar: true,
@@ -3104,14 +3114,14 @@ var ViewService = {
       },
       with_context: context
     };
-    return env2?.requests?.post("/call" /* CALL_PATH */, jsonDataView, {
+    return env?.requests?.post("/call" /* CALL_PATH */, jsonDataView, {
       headers: {
         "Content-Type": "application/json"
       }
     });
   },
   async getMenu(context) {
-    const env2 = getEnv();
+    const env = getEnv();
     const jsonData = {
       model: "ir.ui.menu" /* MENU */,
       method: "web_search_read" /* WEB_SEARCH_READ */,
@@ -3248,14 +3258,14 @@ var ViewService = {
         ]
       }
     };
-    return env2?.requests?.post("/call" /* CALL_PATH */, jsonData, {
+    return env?.requests?.post("/call" /* CALL_PATH */, jsonData, {
       headers: {
         "Content-Type": "application/json"
       }
     });
   },
   async getActionDetail(aid, context) {
-    const env2 = getEnv();
+    const env = getEnv();
     const jsonData = {
       model: "ir.actions.act_window" /* WINDOW_ACTION */,
       method: "web_read" /* WEB_READ */,
@@ -3276,7 +3286,7 @@ var ViewService = {
         }
       }
     };
-    return env2?.requests?.post("/call" /* CALL_PATH */, jsonData, {
+    return env?.requests?.post("/call" /* CALL_PATH */, jsonData, {
       headers: {
         "Content-Type": "application/json"
       }
@@ -3288,7 +3298,7 @@ var ViewService = {
     context,
     offset
   }) {
-    const env2 = getEnv();
+    const env = getEnv();
     const jsonData = {
       model,
       with_context: context,
@@ -3296,14 +3306,14 @@ var ViewService = {
       field: "sequence",
       ...offset > 0 ? { offset } : {}
     };
-    return env2?.requests.post("/web/dataset/resequence", jsonData, {
+    return env?.requests.post("/web/dataset/resequence", jsonData, {
       headers: {
         "Content-Type": "application/json"
       }
     });
   },
   async getSelectionItem({ data }) {
-    const env2 = getEnv();
+    const env = getEnv();
     const jsonData = {
       model: data.model,
       ids: [],
@@ -3321,15 +3331,15 @@ var ViewService = {
         }
       }
     };
-    return env2?.requests.post("/call" /* CALL_PATH */, jsonData, {
+    return env?.requests.post("/call" /* CALL_PATH */, jsonData, {
       headers: {
         "Content-Type": "application/json"
       }
     });
   },
   async loadMessages() {
-    const env2 = getEnv();
-    return env2.requests.post(
+    const env = getEnv();
+    return env.requests.post(
       "/load_message_failures" /* LOAD_MESSAGE */,
       {},
       {
@@ -3340,8 +3350,9 @@ var ViewService = {
     );
   },
   async getVersion() {
-    const env2 = getEnv();
-    return env2?.requests.get("", {
+    const env = getEnv();
+    console.log("env?.requests", env, env?.requests);
+    return env?.requests?.get("", {
       headers: {
         "Content-Type": "application/json"
       }
@@ -3351,12 +3362,12 @@ var ViewService = {
     method,
     with_context
   }) {
-    const env2 = getEnv();
+    const env = getEnv();
     const jsonData = {
       method,
       with_context
     };
-    return env2?.requests.post("/call" /* CALL_PATH */, jsonData, {
+    return env?.requests.post("/call" /* CALL_PATH */, jsonData, {
       headers: {
         "Content-Type": "application/json"
       }
@@ -3369,7 +3380,7 @@ var ViewService = {
     device,
     location
   }) {
-    const env2 = getEnv();
+    const env = getEnv();
     const jsonData = {
       method,
       kwargs: {
@@ -3381,7 +3392,7 @@ var ViewService = {
       },
       with_context
     };
-    return env2?.requests.post("/call" /* CALL_PATH */, jsonData, {
+    return env?.requests.post("/call" /* CALL_PATH */, jsonData, {
       headers: {
         "Content-Type": "application/json"
       },
@@ -3395,7 +3406,7 @@ var ViewService = {
     response_type,
     path
   }) {
-    const env2 = getEnv();
+    const env = getEnv();
     const params = new URLSearchParams({
       response_type,
       client_id,
@@ -3403,7 +3414,7 @@ var ViewService = {
       state
     });
     const url = `${path}?${params.toString()}`;
-    return env2?.requests.get(url, {
+    return env?.requests.get(url, {
       headers: {
         "Content-Type": "application/json"
       },
@@ -3416,14 +3427,14 @@ var ViewService = {
     client_id,
     scopes
   }) {
-    const env2 = getEnv();
+    const env = getEnv();
     const jsonData = {
       redirect_uri,
       state,
       client_id,
       scopes
     };
-    return env2?.requests.post("/grant-access" /* GRANT_ACCESS */, jsonData, {
+    return env?.requests.post("/grant-access" /* GRANT_ACCESS */, jsonData, {
       headers: {
         "Content-Type": "application/json"
       },
@@ -3435,7 +3446,7 @@ var ViewService = {
     token,
     views
   }) {
-    const env2 = getEnv();
+    const env = getEnv();
     const jsonData = {
       method,
       kwargs: {
@@ -3445,7 +3456,7 @@ var ViewService = {
         token
       }
     };
-    return env2?.requests.post("/call" /* CALL_PATH */, jsonData, {
+    return env?.requests.post("/call" /* CALL_PATH */, jsonData, {
       headers: {
         "Content-Type": "application/json"
       }
@@ -3457,7 +3468,7 @@ var ViewService = {
     kwargs,
     token
   }) {
-    const env2 = getEnv();
+    const env = getEnv();
     const jsonData = {
       method,
       model,
@@ -3466,21 +3477,21 @@ var ViewService = {
         token
       }
     };
-    return env2?.requests.post("/call" /* CALL_PATH */, jsonData, {
+    return env?.requests.post("/call" /* CALL_PATH */, jsonData, {
       headers: {
         "Content-Type": "application/json"
       }
     });
   },
   async requestSetupTotp({ method, token }) {
-    const env2 = getEnv();
+    const env = getEnv();
     const jsonData = {
       method,
       with_context: {
         token
       }
     };
-    return env2?.requests.post("/call" /* CALL_PATH */, jsonData, {
+    return env?.requests.post("/call" /* CALL_PATH */, jsonData, {
       headers: {
         "Content-Type": "application/json"
       }
@@ -3491,7 +3502,7 @@ var ViewService = {
     action_token,
     code
   }) {
-    const env2 = getEnv();
+    const env = getEnv();
     const jsonData = {
       method,
       kwargs: {
@@ -3503,21 +3514,21 @@ var ViewService = {
         action_token
       }
     };
-    return env2?.requests.post("/call" /* CALL_PATH */, jsonData, {
+    return env?.requests.post("/call" /* CALL_PATH */, jsonData, {
       headers: {
         "Content-Type": "application/json"
       }
     });
   },
   async removeTotpSetUp({ method, token }) {
-    const env2 = getEnv();
+    const env = getEnv();
     const jsonData = {
       method,
       with_context: {
         token
       }
     };
-    return env2?.requests.post("/call" /* CALL_PATH */, jsonData, {
+    return env?.requests.post("/call" /* CALL_PATH */, jsonData, {
       headers: {
         "Content-Type": "application/json"
       }
@@ -3538,6 +3549,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

@@ -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

@@ -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;