@fctc/interface-logic 2.1.3 → 2.1.5

package/dist/configs.js

@@ -2208,9 +2208,11 @@ var sessionStorageUtils = () => {
 // src/configs/axios-client.ts
 var axiosClient = {
   init(config) {
+    console.log("config", config);
     const localStorage2 = config?.localStorageUtils ?? localStorageUtils();
     const sessionStorage2 = config?.sessionStorageUtils ?? sessionStorageUtils();
     const db = config?.db;
+    const database = config?.config?.database;
     let isRefreshing = false;
     let failedQueue = [];
     const processQueue = (error, token = null) => {
@@ -2231,12 +2233,19 @@ var axiosClient = {
     });
     instance.interceptors.request.use(async (config2) => {
       const { useRefreshToken, useActionToken, actionToken } = config2;
+      let token = null;
       if (useActionToken && actionToken) {
-        config2.headers["Action-Token"] = actionToken;
+        token = actionToken;
+      } else {
+        const getToken = useRefreshToken ? localStorage2.getRefreshToken : localStorage2.getAccessToken;
+        token = await getToken?.();
+      }
+      if (token) {
+        config2.headers["Authorization"] = `Bearer ${token}`;
+      }
+      if (database) {
+        config2.headers["DATABASE"] = database;
       }
-      const getToken = useRefreshToken ? localStorage2.getRefreshToken : localStorage2.getAccessToken;
-      const token = await getToken?.();
-      if (token) config2.headers["Authorization"] = `Bearer ${token}`;
       return config2;
     }, Promise.reject);
     instance.interceptors.response.use(

package/dist/configs.mjs

@@ -2172,9 +2172,11 @@ var sessionStorageUtils = () => {
 // src/configs/axios-client.ts
 var axiosClient = {
   init(config) {
+    console.log("config", config);
     const localStorage2 = config?.localStorageUtils ?? localStorageUtils();
     const sessionStorage2 = config?.sessionStorageUtils ?? sessionStorageUtils();
     const db = config?.db;
+    const database = config?.config?.database;
     let isRefreshing = false;
     let failedQueue = [];
     const processQueue = (error, token = null) => {
@@ -2195,12 +2197,19 @@ var axiosClient = {
     });
     instance.interceptors.request.use(async (config2) => {
       const { useRefreshToken, useActionToken, actionToken } = config2;
+      let token = null;
       if (useActionToken && actionToken) {
-        config2.headers["Action-Token"] = actionToken;
+        token = actionToken;
+      } else {
+        const getToken = useRefreshToken ? localStorage2.getRefreshToken : localStorage2.getAccessToken;
+        token = await getToken?.();
+      }
+      if (token) {
+        config2.headers["Authorization"] = `Bearer ${token}`;
+      }
+      if (database) {
+        config2.headers["DATABASE"] = database;
       }
-      const getToken = useRefreshToken ? localStorage2.getRefreshToken : localStorage2.getAccessToken;
-      const token = await getToken?.();
-      if (token) config2.headers["Authorization"] = `Bearer ${token}`;
       return config2;
     }, Promise.reject);
     instance.interceptors.response.use(

package/dist/constants.d.mts

@@ -43,6 +43,7 @@ declare enum UriConstants {
     IMAGE_PATH = "/web/image",
     LOAD_MESSAGE = "/load_message_failures",
     TOKEN = "/check_token",
+    VALIDATE_ACTION_TOKEN = "/action-token/validate",
     CREATE_UPDATE_PATH = "/create_update",
     TWOFA_METHOD_PATH = "/id/api/v2/call",
     SIGNIN_SSO = "/signin-sso/oauth",

package/dist/constants.d.ts

@@ -43,6 +43,7 @@ declare enum UriConstants {
     IMAGE_PATH = "/web/image",
     LOAD_MESSAGE = "/load_message_failures",
     TOKEN = "/check_token",
+    VALIDATE_ACTION_TOKEN = "/action-token/validate",
     CREATE_UPDATE_PATH = "/create_update",
     TWOFA_METHOD_PATH = "/id/api/v2/call",
     SIGNIN_SSO = "/signin-sso/oauth",

package/dist/constants.js

@@ -86,6 +86,7 @@ var UriConstants = /* @__PURE__ */ ((UriConstants2) => {
   UriConstants2["IMAGE_PATH"] = `/web/image`;
   UriConstants2["LOAD_MESSAGE"] = `/load_message_failures`;
   UriConstants2["TOKEN"] = `/check_token`;
+  UriConstants2["VALIDATE_ACTION_TOKEN"] = "/action-token/validate";
   UriConstants2["CREATE_UPDATE_PATH"] = `/create_update`;
   UriConstants2["TWOFA_METHOD_PATH"] = `/id/api/v2/call`;
   UriConstants2["SIGNIN_SSO"] = `/signin-sso/oauth`;

package/dist/constants.mjs

@@ -48,6 +48,7 @@ var UriConstants = /* @__PURE__ */ ((UriConstants2) => {
   UriConstants2["IMAGE_PATH"] = `/web/image`;
   UriConstants2["LOAD_MESSAGE"] = `/load_message_failures`;
   UriConstants2["TOKEN"] = `/check_token`;
+  UriConstants2["VALIDATE_ACTION_TOKEN"] = "/action-token/validate";
   UriConstants2["CREATE_UPDATE_PATH"] = `/create_update`;
   UriConstants2["TWOFA_METHOD_PATH"] = `/id/api/v2/call`;
   UriConstants2["SIGNIN_SSO"] = `/signin-sso/oauth`;

package/dist/environment.d.mts

@@ -19,6 +19,7 @@ interface EnvConfig {
     companies?: any[];
     user?: any;
     db?: string;
+    database?: string;
     refreshTokenEndpoint?: string;
     localStorageUtils?: LocalStorageUtilsType;
     sessionStorageUtils?: SessionStorageUtilsType;

package/dist/environment.d.ts

@@ -19,6 +19,7 @@ interface EnvConfig {
     companies?: any[];
     user?: any;
     db?: string;
+    database?: string;
     refreshTokenEndpoint?: string;
     localStorageUtils?: LocalStorageUtilsType;
     sessionStorageUtils?: SessionStorageUtilsType;

package/dist/environment.js

@@ -2210,9 +2210,11 @@ var sessionStorageUtils = () => {
 // src/configs/axios-client.ts
 var axiosClient = {
   init(config) {
+    console.log("config", config);
     const localStorage2 = config?.localStorageUtils ?? localStorageUtils();
     const sessionStorage2 = config?.sessionStorageUtils ?? sessionStorageUtils();
     const db = config?.db;
+    const database = config?.config?.database;
     let isRefreshing = false;
     let failedQueue = [];
     const processQueue = (error, token = null) => {
@@ -2233,12 +2235,19 @@ var axiosClient = {
     });
     instance.interceptors.request.use(async (config2) => {
       const { useRefreshToken, useActionToken, actionToken } = config2;
+      let token = null;
       if (useActionToken && actionToken) {
-        config2.headers["Action-Token"] = actionToken;
+        token = actionToken;
+      } else {
+        const getToken = useRefreshToken ? localStorage2.getRefreshToken : localStorage2.getAccessToken;
+        token = await getToken?.();
+      }
+      if (token) {
+        config2.headers["Authorization"] = `Bearer ${token}`;
+      }
+      if (database) {
+        config2.headers["DATABASE"] = database;
       }
-      const getToken = useRefreshToken ? localStorage2.getRefreshToken : localStorage2.getAccessToken;
-      const token = await getToken?.();
-      if (token) config2.headers["Authorization"] = `Bearer ${token}`;
       return config2;
     }, Promise.reject);
     instance.interceptors.response.use(

package/dist/environment.mjs

@@ -2172,9 +2172,11 @@ var sessionStorageUtils = () => {
 // src/configs/axios-client.ts
 var axiosClient = {
   init(config) {
+    console.log("config", config);
     const localStorage2 = config?.localStorageUtils ?? localStorageUtils();
     const sessionStorage2 = config?.sessionStorageUtils ?? sessionStorageUtils();
     const db = config?.db;
+    const database = config?.config?.database;
     let isRefreshing = false;
     let failedQueue = [];
     const processQueue = (error, token = null) => {
@@ -2195,12 +2197,19 @@ var axiosClient = {
     });
     instance.interceptors.request.use(async (config2) => {
       const { useRefreshToken, useActionToken, actionToken } = config2;
+      let token = null;
       if (useActionToken && actionToken) {
-        config2.headers["Action-Token"] = actionToken;
+        token = actionToken;
+      } else {
+        const getToken = useRefreshToken ? localStorage2.getRefreshToken : localStorage2.getAccessToken;
+        token = await getToken?.();
+      }
+      if (token) {
+        config2.headers["Authorization"] = `Bearer ${token}`;
+      }
+      if (database) {
+        config2.headers["DATABASE"] = database;
       }
-      const getToken = useRefreshToken ? localStorage2.getRefreshToken : localStorage2.getAccessToken;
-      const token = await getToken?.();
-      if (token) config2.headers["Authorization"] = `Bearer ${token}`;
       return config2;
     }, Promise.reject);
     instance.interceptors.response.use(

package/dist/hooks.d.mts

@@ -38,7 +38,6 @@ declare const useGetAccessByCode: () => _tanstack_react_query.UseMutationResult<
 
 declare const useValidateActionToken: () => _tanstack_react_query.UseMutationResult<any, Error, {
     actionToken: string;
-    path: string;
 }, unknown>;
 
 declare const useGetCompanyInfo: () => _tanstack_react_query.UseMutationResult<any, Error, number, unknown>;
@@ -261,7 +260,7 @@ declare const useGetGroups: ({ model, width_context, }: {
 
 declare const useGetListData: (listDataProps: any, queryKey?: any, enabled?: any) => _tanstack_react_query.UseQueryResult<any, Error>;
 
-declare const useGetMenu: (context: any, enabled?: boolean) => _tanstack_react_query.UseQueryResult<any, Error>;
+declare const useGetMenu: (context: any, specification: any, enabled?: boolean) => _tanstack_react_query.UseQueryResult<any, Error>;
 
 declare const useGetPrintReport: () => _tanstack_react_query.UseMutationResult<any, Error, {
     id: number;
@@ -314,6 +313,7 @@ declare const useSignInSSO: () => _tanstack_react_query.UseMutationResult<any, E
     client_id: string;
     response_type: string;
     path: string;
+    scope: string;
 }, unknown>;
 
 declare const useVerify2FA: () => _tanstack_react_query.UseMutationResult<unknown, Error, {

package/dist/hooks.d.ts

@@ -38,7 +38,6 @@ declare const useGetAccessByCode: () => _tanstack_react_query.UseMutationResult<
 
 declare const useValidateActionToken: () => _tanstack_react_query.UseMutationResult<any, Error, {
     actionToken: string;
-    path: string;
 }, unknown>;
 
 declare const useGetCompanyInfo: () => _tanstack_react_query.UseMutationResult<any, Error, number, unknown>;
@@ -261,7 +260,7 @@ declare const useGetGroups: ({ model, width_context, }: {
 
 declare const useGetListData: (listDataProps: any, queryKey?: any, enabled?: any) => _tanstack_react_query.UseQueryResult<any, Error>;
 
-declare const useGetMenu: (context: any, enabled?: boolean) => _tanstack_react_query.UseQueryResult<any, Error>;
+declare const useGetMenu: (context: any, specification: any, enabled?: boolean) => _tanstack_react_query.UseQueryResult<any, Error>;
 
 declare const useGetPrintReport: () => _tanstack_react_query.UseMutationResult<any, Error, {
     id: number;
@@ -314,6 +313,7 @@ declare const useSignInSSO: () => _tanstack_react_query.UseMutationResult<any, E
     client_id: string;
     response_type: string;
     path: string;
+    scope: string;
 }, unknown>;
 
 declare const useVerify2FA: () => _tanstack_react_query.UseMutationResult<unknown, Error, {

package/dist/hooks.js

@@ -128,6 +128,7 @@ var UriConstants = /* @__PURE__ */ ((UriConstants2) => {
   UriConstants2["IMAGE_PATH"] = `/web/image`;
   UriConstants2["LOAD_MESSAGE"] = `/load_message_failures`;
   UriConstants2["TOKEN"] = `/check_token`;
+  UriConstants2["VALIDATE_ACTION_TOKEN"] = "/action-token/validate";
   UriConstants2["CREATE_UPDATE_PATH"] = `/create_update`;
   UriConstants2["TWOFA_METHOD_PATH"] = `/id/api/v2/call`;
   UriConstants2["SIGNIN_SSO"] = `/signin-sso/oauth`;
@@ -3204,9 +3205,9 @@ function useAuthService() {
     [env]
   );
   const isValidActionToken = (0, import_react7.useCallback)(
-    async (actionToken, path) => {
+    async (actionToken) => {
       return env?.requests?.post(
-        path,
+        "/action-token/validate" /* VALIDATE_ACTION_TOKEN */,
         {},
         {
           headers: {
@@ -4152,101 +4153,14 @@ function useViewService() {
     [env]
   );
   const getMenu = (0, import_react14.useCallback)(
-    async (context) => {
+    async (context, specification) => {
       const jsonData = {
         model: "ir.ui.menu" /* MENU */,
         method: "web_search_read" /* WEB_SEARCH_READ */,
         ids: [],
         with_context: context,
         kwargs: {
-          specification: {
-            active: {},
-            name: {},
-            is_display: {},
-            sequence: {},
-            complete_name: {},
-            action: {
-              fields: {
-                display_name: {},
-                type: {},
-                binding_view_types: {}
-              }
-            },
-            url_icon: {},
-            web_icon: {},
-            web_icon_data: {},
-            groups_id: {
-              fields: {
-                full_name: {}
-              },
-              limit: 40,
-              order: ""
-            },
-            display_name: {},
-            child_id: {
-              fields: {
-                active: {},
-                name: {},
-                is_display: {},
-                sequence: {},
-                complete_name: {},
-                action: {
-                  fields: {
-                    display_name: {},
-                    type: {},
-                    binding_view_types: {}
-                  }
-                },
-                url_icon: {},
-                web_icon: {},
-                web_icon_data: {},
-                groups_id: {
-                  fields: {
-                    full_name: {}
-                  },
-                  limit: 40,
-                  order: ""
-                },
-                display_name: {},
-                child_id: {
-                  fields: {
-                    active: {},
-                    name: {},
-                    is_display: {},
-                    sequence: {},
-                    complete_name: {},
-                    action: {
-                      fields: {
-                        display_name: {},
-                        type: {},
-                        binding_view_types: {}
-                      }
-                    },
-                    url_icon: {},
-                    web_icon: {},
-                    web_icon_data: {},
-                    groups_id: {
-                      fields: {
-                        full_name: {}
-                      },
-                      limit: 40,
-                      order: ""
-                    },
-                    display_name: {},
-                    child_id: {
-                      fields: {},
-                      limit: 40,
-                      order: ""
-                    }
-                  },
-                  limit: 40,
-                  order: ""
-                }
-              },
-              limit: 40,
-              order: ""
-            }
-          },
+          specification,
           domain: [
             "&",
             ["is_display", "=", true],
@@ -4441,18 +4355,25 @@ function useViewService() {
       redirect_uri,
       state,
       client_id,
-      response_type
+      response_type,
+      path,
+      scope
     }) => {
-      const jsonData = {
-        redirect_uri,
-        state,
+      const params = new URLSearchParams({
+        response_type,
         client_id,
-        response_type
-      };
-      return env?.requests.get("/signin-sso/oauth" /* SIGNIN_SSO */, jsonData, {
+        redirect_uri,
+        state
+      });
+      const queryString = `${params.toString()}&scope=${encodeURIComponent(
+        scope
+      )}`;
+      const url = `${path}?${queryString}`;
+      return env?.requests.get(url, {
         headers: {
-          credentials: "include"
-        }
+          "Content-Type": "application/json"
+        },
+        withCredentials: true
       });
     },
     [env]
@@ -4691,11 +4612,8 @@ var import_react_query14 = require("@tanstack/react-query");
 var useValidateActionToken = () => {
   const { isValidActionToken } = useAuthService();
   return (0, import_react_query14.useMutation)({
-    mutationFn: ({
-      actionToken,
-      path
-    }) => {
-      return isValidActionToken(actionToken, path);
+    mutationFn: ({ actionToken }) => {
+      return isValidActionToken(actionToken);
     }
   });
 };
@@ -5386,7 +5304,6 @@ var useGetActionDetail = ({
   model,
   queryKey
 }) => {
-  const { getFormView } = useFormService();
   const { getActionDetail } = useViewService();
   const data = {
     id,
@@ -5401,9 +5318,6 @@ var useGetActionDetail = ({
         if (res && res.length > 0) {
           return res[0];
         }
-      } else {
-        const res = await getFormView({ data });
-        return res;
       }
     },
     enabled,
@@ -5476,11 +5390,11 @@ var use_get_list_data_default = useGetListData;
 
 // src/hooks/view/use-get-menu.ts
 var import_react_query50 = require("@tanstack/react-query");
-var useGetMenu = (context, enabled) => {
+var useGetMenu = (context, specification, enabled) => {
   const { getMenu } = useViewService();
   return (0, import_react_query50.useQuery)({
     queryKey: ["menus" /* MENU */, context],
-    queryFn: () => getMenu(context).then((res) => {
+    queryFn: () => getMenu(context, specification).then((res) => {
       if (res && res?.records && res?.records?.length > 0) {
         return res?.records;
       }
@@ -5669,13 +5583,16 @@ var useSignInSSO = () => {
       state,
       client_id,
       response_type,
-      path
+      path,
+      scope
     }) => {
       return signInSSO({
         redirect_uri,
         state,
         client_id,
-        response_type
+        response_type,
+        path,
+        scope
       });
     }
   });