@fctc/interface-logic 4.1.2 → 4.1.4

package/dist/configs.js

@@ -2252,6 +2252,9 @@ var sessionStorageUtils = /* @__PURE__ */ (() => {
 })();
 
 // src/configs/axios-client.ts
+function removeLanguages(acceptLang, removeList) {
+  return acceptLang.split(",").map((x) => x.trim()).filter((item) => !removeList?.some((lang) => item?.startsWith(lang))).join(",");
+}
 var axiosClient = {
   init(config) {
     const localStorage2 = config?.localStorageUtils ?? localStorageUtils();
@@ -2277,9 +2280,11 @@ var axiosClient = {
       paramsSerializer: (params) => new URLSearchParams(params).toString()
     });
     instance.interceptors.request.use(async (configReq) => {
+      const rawLang = navigator.languages?.join(",") || navigator.language;
       const useRefreshToken = configReq.headers["X-Use-Refresh-Token"] === "true";
       const useActionToken = configReq.headers["X-Use-Action-Token"] === "true";
       const actionToken = configReq.headers["X-Action-Token"];
+      const cleaned = removeLanguages(rawLang, config?.excludeLanguages);
       let token = null;
       if (useActionToken && actionToken) {
         token = actionToken;
@@ -2293,6 +2298,7 @@ var axiosClient = {
       if (database) {
         configReq.headers["DATABASE"] = database;
       }
+      configReq.headers["Accept-Language"] = cleaned;
       return configReq;
     }, Promise.reject);
     const buildRefreshUrl = () => {

package/dist/configs.mjs

@@ -2216,6 +2216,9 @@ var sessionStorageUtils = /* @__PURE__ */ (() => {
 })();
 
 // src/configs/axios-client.ts
+function removeLanguages(acceptLang, removeList) {
+  return acceptLang.split(",").map((x) => x.trim()).filter((item) => !removeList?.some((lang) => item?.startsWith(lang))).join(",");
+}
 var axiosClient = {
   init(config) {
     const localStorage2 = config?.localStorageUtils ?? localStorageUtils();
@@ -2241,9 +2244,11 @@ var axiosClient = {
       paramsSerializer: (params) => new URLSearchParams(params).toString()
     });
     instance.interceptors.request.use(async (configReq) => {
+      const rawLang = navigator.languages?.join(",") || navigator.language;
       const useRefreshToken = configReq.headers["X-Use-Refresh-Token"] === "true";
       const useActionToken = configReq.headers["X-Use-Action-Token"] === "true";
       const actionToken = configReq.headers["X-Action-Token"];
+      const cleaned = removeLanguages(rawLang, config?.excludeLanguages);
       let token = null;
       if (useActionToken && actionToken) {
         token = actionToken;
@@ -2257,6 +2262,7 @@ var axiosClient = {
       if (database) {
         configReq.headers["DATABASE"] = database;
       }
+      configReq.headers["Accept-Language"] = cleaned;
       return configReq;
     }, Promise.reject);
     const buildRefreshUrl = () => {

package/dist/environment.js

@@ -2254,6 +2254,9 @@ var sessionStorageUtils = /* @__PURE__ */ (() => {
 })();
 
 // src/configs/axios-client.ts
+function removeLanguages(acceptLang, removeList) {
+  return acceptLang.split(",").map((x) => x.trim()).filter((item) => !removeList?.some((lang) => item?.startsWith(lang))).join(",");
+}
 var axiosClient = {
   init(config) {
     const localStorage2 = config?.localStorageUtils ?? localStorageUtils();
@@ -2279,9 +2282,11 @@ var axiosClient = {
       paramsSerializer: (params) => new URLSearchParams(params).toString()
     });
     instance.interceptors.request.use(async (configReq) => {
+      const rawLang = navigator.languages?.join(",") || navigator.language;
       const useRefreshToken = configReq.headers["X-Use-Refresh-Token"] === "true";
       const useActionToken = configReq.headers["X-Use-Action-Token"] === "true";
       const actionToken = configReq.headers["X-Action-Token"];
+      const cleaned = removeLanguages(rawLang, config?.excludeLanguages);
       let token = null;
       if (useActionToken && actionToken) {
         token = actionToken;
@@ -2295,6 +2300,7 @@ var axiosClient = {
       if (database) {
         configReq.headers["DATABASE"] = database;
       }
+      configReq.headers["Accept-Language"] = cleaned;
       return configReq;
     }, Promise.reject);
     const buildRefreshUrl = () => {

package/dist/environment.mjs

@@ -2216,6 +2216,9 @@ var sessionStorageUtils = /* @__PURE__ */ (() => {
 })();
 
 // src/configs/axios-client.ts
+function removeLanguages(acceptLang, removeList) {
+  return acceptLang.split(",").map((x) => x.trim()).filter((item) => !removeList?.some((lang) => item?.startsWith(lang))).join(",");
+}
 var axiosClient = {
   init(config) {
     const localStorage2 = config?.localStorageUtils ?? localStorageUtils();
@@ -2241,9 +2244,11 @@ var axiosClient = {
       paramsSerializer: (params) => new URLSearchParams(params).toString()
     });
     instance.interceptors.request.use(async (configReq) => {
+      const rawLang = navigator.languages?.join(",") || navigator.language;
       const useRefreshToken = configReq.headers["X-Use-Refresh-Token"] === "true";
       const useActionToken = configReq.headers["X-Use-Action-Token"] === "true";
       const actionToken = configReq.headers["X-Action-Token"];
+      const cleaned = removeLanguages(rawLang, config?.excludeLanguages);
       let token = null;
       if (useActionToken && actionToken) {
         token = actionToken;
@@ -2257,6 +2262,7 @@ var axiosClient = {
       if (database) {
         configReq.headers["DATABASE"] = database;
       }
+      configReq.headers["Accept-Language"] = cleaned;
       return configReq;
     }, Promise.reject);
     const buildRefreshUrl = () => {

package/dist/hooks.d.mts

@@ -697,6 +697,7 @@ declare const useGetCurrentUser: () => _tanstack_react_query.UseMutationResult<a
     service?: string;
     xNode?: string;
     oauthUid?: string;
+    extraHeaders?: any;
 }, unknown>;
 
 declare const useReadGroup: (services?: string, xNode?: any, body?: any, enabled?: boolean) => _tanstack_react_query.UseQueryResult<any, Error>;

package/dist/hooks.d.ts

@@ -697,6 +697,7 @@ declare const useGetCurrentUser: () => _tanstack_react_query.UseMutationResult<a
     service?: string;
     xNode?: string;
     oauthUid?: string;
+    extraHeaders?: any;
 }, unknown>;
 
 declare const useReadGroup: (services?: string, xNode?: any, body?: any, enabled?: boolean) => _tanstack_react_query.UseQueryResult<any, Error>;

package/dist/hooks.js

@@ -5828,12 +5828,17 @@ function useViewService() {
     async ({
       service,
       xNode,
-      oauthUid
+      oauthUid,
+      extraHeaders
     }) => {
       return env?.requests?.get(
         `${"/public/user/info" /* PUBLIC_USER_INFO */}/${oauthUid}`,
         {
-          headers: {
+          headers: extraHeaders ? {
+            ...extraHeaders,
+            "Content-Type": "application/json",
+            ...xNode ? { "X-Node": xNode } : {}
+          } : {
             "Content-Type": "application/json",
             ...xNode ? { "X-Node": xNode } : {}
           }
@@ -8192,7 +8197,8 @@ var useGetCurrentUser = () => {
     mutationFn: ({
       service,
       xNode,
-      oauthUid
+      oauthUid,
+      extraHeaders
     }) => {
       return getCurrentUser({ service, xNode, oauthUid });
     }

package/dist/hooks.mjs

@@ -5685,12 +5685,17 @@ function useViewService() {
     async ({
       service,
       xNode,
-      oauthUid
+      oauthUid,
+      extraHeaders
     }) => {
       return env?.requests?.get(
         `${"/public/user/info" /* PUBLIC_USER_INFO */}/${oauthUid}`,
         {
-          headers: {
+          headers: extraHeaders ? {
+            ...extraHeaders,
+            "Content-Type": "application/json",
+            ...xNode ? { "X-Node": xNode } : {}
+          } : {
             "Content-Type": "application/json",
             ...xNode ? { "X-Node": xNode } : {}
           }
@@ -8049,7 +8054,8 @@ var useGetCurrentUser = () => {
     mutationFn: ({
       service,
       xNode,
-      oauthUid
+      oauthUid,
+      extraHeaders
     }) => {
       return getCurrentUser({ service, xNode, oauthUid });
     }

package/dist/provider.d.mts

@@ -46,6 +46,7 @@ interface EnvConfig {
     sessionStorageUtils?: any;
     envFile?: any;
     xNode?: string;
+    excludeLanguages?: string[];
 }
 declare function EnvProvider({ children, localStorageUtils: localStorageUtil, sessionStorageUtils: sessionStorageUtil, }: {
     children: React.ReactNode;

package/dist/provider.d.ts

@@ -46,6 +46,7 @@ interface EnvConfig {
     sessionStorageUtils?: any;
     envFile?: any;
     xNode?: string;
+    excludeLanguages?: string[];
 }
 declare function EnvProvider({ children, localStorageUtils: localStorageUtil, sessionStorageUtils: sessionStorageUtil, }: {
     children: React.ReactNode;

package/dist/provider.js

@@ -5815,12 +5815,17 @@ function useViewService() {
     async ({
       service,
       xNode,
-      oauthUid
+      oauthUid,
+      extraHeaders
     }) => {
       return env?.requests?.get(
         `${"/public/user/info" /* PUBLIC_USER_INFO */}/${oauthUid}`,
         {
-          headers: {
+          headers: extraHeaders ? {
+            ...extraHeaders,
+            "Content-Type": "application/json",
+            ...xNode ? { "X-Node": xNode } : {}
+          } : {
             "Content-Type": "application/json",
             ...xNode ? { "X-Node": xNode } : {}
           }
@@ -5976,6 +5981,9 @@ var import_react14 = require("react");
 
 // src/configs/axios-client.ts
 var import_axios = __toESM(require("axios"));
+function removeLanguages(acceptLang, removeList) {
+  return acceptLang.split(",").map((x) => x.trim()).filter((item) => !removeList?.some((lang) => item?.startsWith(lang))).join(",");
+}
 var axiosClient = {
   init(config) {
     const localStorage2 = config?.localStorageUtils ?? localStorageUtils();
@@ -6001,9 +6009,11 @@ var axiosClient = {
       paramsSerializer: (params) => new URLSearchParams(params).toString()
     });
     instance.interceptors.request.use(async (configReq) => {
+      const rawLang = navigator.languages?.join(",") || navigator.language;
       const useRefreshToken = configReq.headers["X-Use-Refresh-Token"] === "true";
       const useActionToken = configReq.headers["X-Use-Action-Token"] === "true";
       const actionToken = configReq.headers["X-Action-Token"];
+      const cleaned = removeLanguages(rawLang, config?.excludeLanguages);
       let token = null;
       if (useActionToken && actionToken) {
         token = actionToken;
@@ -6017,6 +6027,7 @@ var axiosClient = {
       if (database) {
         configReq.headers["DATABASE"] = database;
       }
+      configReq.headers["Accept-Language"] = cleaned;
       return configReq;
     }, Promise.reject);
     const buildRefreshUrl = () => {
@@ -6315,7 +6326,8 @@ var initialEnvState = {
     uid: null,
     lang: "vi_VN",
     tz: "Asia/Saigon"
-  }
+  },
+  excludeLanguages: []
 };
 var EnvContext = (0, import_react14.createContext)(null);
 function EnvProvider({
@@ -8668,7 +8680,8 @@ var useGetCurrentUser = () => {
     mutationFn: ({
       service,
       xNode,
-      oauthUid
+      oauthUid,
+      extraHeaders
     }) => {
       return getCurrentUser({ service, xNode, oauthUid });
     }

package/dist/provider.mjs

@@ -5772,12 +5772,17 @@ function useViewService() {
     async ({
       service,
       xNode,
-      oauthUid
+      oauthUid,
+      extraHeaders
     }) => {
       return env?.requests?.get(
         `${"/public/user/info" /* PUBLIC_USER_INFO */}/${oauthUid}`,
         {
-          headers: {
+          headers: extraHeaders ? {
+            ...extraHeaders,
+            "Content-Type": "application/json",
+            ...xNode ? { "X-Node": xNode } : {}
+          } : {
             "Content-Type": "application/json",
             ...xNode ? { "X-Node": xNode } : {}
           }
@@ -5933,6 +5938,9 @@ import { createContext, useContext, useState as useState4, useCallback as useCal
 
 // src/configs/axios-client.ts
 import axios from "axios";
+function removeLanguages(acceptLang, removeList) {
+  return acceptLang.split(",").map((x) => x.trim()).filter((item) => !removeList?.some((lang) => item?.startsWith(lang))).join(",");
+}
 var axiosClient = {
   init(config) {
     const localStorage2 = config?.localStorageUtils ?? localStorageUtils();
@@ -5958,9 +5966,11 @@ var axiosClient = {
       paramsSerializer: (params) => new URLSearchParams(params).toString()
     });
     instance.interceptors.request.use(async (configReq) => {
+      const rawLang = navigator.languages?.join(",") || navigator.language;
       const useRefreshToken = configReq.headers["X-Use-Refresh-Token"] === "true";
       const useActionToken = configReq.headers["X-Use-Action-Token"] === "true";
       const actionToken = configReq.headers["X-Action-Token"];
+      const cleaned = removeLanguages(rawLang, config?.excludeLanguages);
       let token = null;
       if (useActionToken && actionToken) {
         token = actionToken;
@@ -5974,6 +5984,7 @@ var axiosClient = {
       if (database) {
         configReq.headers["DATABASE"] = database;
       }
+      configReq.headers["Accept-Language"] = cleaned;
       return configReq;
     }, Promise.reject);
     const buildRefreshUrl = () => {
@@ -6272,7 +6283,8 @@ var initialEnvState = {
     uid: null,
     lang: "vi_VN",
     tz: "Asia/Saigon"
-  }
+  },
+  excludeLanguages: []
 };
 var EnvContext = createContext(null);
 function EnvProvider({
@@ -8625,7 +8637,8 @@ var useGetCurrentUser = () => {
     mutationFn: ({
       service,
       xNode,
-      oauthUid
+      oauthUid,
+      extraHeaders
     }) => {
       return getCurrentUser({ service, xNode, oauthUid });
     }

package/dist/services.d.mts

@@ -528,10 +528,11 @@ declare function useViewService(): {
         ids?: any;
         withContext?: any;
     }) => Promise<any>;
-    getCurrentUser: ({ service, xNode, oauthUid, }: {
+    getCurrentUser: ({ service, xNode, oauthUid, extraHeaders, }: {
         service?: string;
         xNode?: string;
         oauthUid?: string;
+        extraHeaders?: any;
     }) => Promise<any>;
 };
 

package/dist/services.d.ts

@@ -528,10 +528,11 @@ declare function useViewService(): {
         ids?: any;
         withContext?: any;
     }) => Promise<any>;
-    getCurrentUser: ({ service, xNode, oauthUid, }: {
+    getCurrentUser: ({ service, xNode, oauthUid, extraHeaders, }: {
         service?: string;
         xNode?: string;
         oauthUid?: string;
+        extraHeaders?: any;
     }) => Promise<any>;
 };
 

package/dist/services.js

@@ -6028,12 +6028,17 @@ function useViewService() {
     async ({
       service,
       xNode,
-      oauthUid
+      oauthUid,
+      extraHeaders
     }) => {
       return env?.requests?.get(
         `${"/public/user/info" /* PUBLIC_USER_INFO */}/${oauthUid}`,
         {
-          headers: {
+          headers: extraHeaders ? {
+            ...extraHeaders,
+            "Content-Type": "application/json",
+            ...xNode ? { "X-Node": xNode } : {}
+          } : {
             "Content-Type": "application/json",
             ...xNode ? { "X-Node": xNode } : {}
           }

package/dist/services.mjs

@@ -5983,12 +5983,17 @@ function useViewService() {
     async ({
       service,
       xNode,
-      oauthUid
+      oauthUid,
+      extraHeaders
     }) => {
       return env?.requests?.get(
         `${"/public/user/info" /* PUBLIC_USER_INFO */}/${oauthUid}`,
         {
-          headers: {
+          headers: extraHeaders ? {
+            ...extraHeaders,
+            "Content-Type": "application/json",
+            ...xNode ? { "X-Node": xNode } : {}
+          } : {
             "Content-Type": "application/json",
             ...xNode ? { "X-Node": xNode } : {}
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fctc/interface-logic",
-  "version": "4.1.2",
+  "version": "4.1.4",
   "types": "dist/index.d.ts",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",