@fctc/interface-logic 1.7.4 → 1.7.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/provider.js CHANGED
@@ -81,25 +81,11 @@ var breadcrums_slice_default = breadcrumbsSlice.reducer;
81
81
  var import_toolkit2 = require("@reduxjs/toolkit");
82
82
  var initialState2 = {
83
83
  baseUrl: "",
84
+ requests: null,
84
85
  companies: [],
85
86
  user: {},
86
- db: "",
87
- refreshTokenEndpoint: "",
88
- config: {
89
- grantType: "",
90
- clientId: "",
91
- clientSecret: "",
92
- redirectUri: ""
93
- },
87
+ config: null,
94
88
  envFile: null,
95
- requests: {
96
- get: async (url, headers) => ({}),
97
- post: async (url, body, headers) => ({}),
98
- post_excel: async (url, body, headers) => ({}),
99
- put: async (url, body, headers) => ({}),
100
- patch: async (url, body) => ({}),
101
- delete: async (url, body) => ({})
102
- },
103
89
  defaultCompany: {
104
90
  id: null,
105
91
  logo: "",
@@ -2815,11 +2801,333 @@ function matchDomain(record, domain) {
2815
2801
 
2816
2802
  // src/utils/function.ts
2817
2803
  var import_react = require("react");
2804
+ var updateTokenParamInOriginalRequest = (originalRequest, newAccessToken) => {
2805
+ if (!originalRequest.data) return originalRequest.data;
2806
+ if (typeof originalRequest.data === "string") {
2807
+ try {
2808
+ const parsedData = JSON.parse(originalRequest.data);
2809
+ if (parsedData.with_context && typeof parsedData.with_context === "object") {
2810
+ parsedData.with_context.token = newAccessToken;
2811
+ }
2812
+ return JSON.stringify(parsedData);
2813
+ } catch (e) {
2814
+ console.warn("Failed to parse originalRequest.data", e);
2815
+ return originalRequest.data;
2816
+ }
2817
+ }
2818
+ if (typeof originalRequest.data === "object" && originalRequest.data.with_context) {
2819
+ originalRequest.data.with_context.token = newAccessToken;
2820
+ }
2821
+ return originalRequest.data;
2822
+ };
2823
+
2824
+ // src/utils/storage/local-storage.ts
2825
+ var localStorageUtils = () => {
2826
+ const setToken = async (access_token) => {
2827
+ localStorage.setItem("accessToken", access_token);
2828
+ };
2829
+ const setRefreshToken = async (refresh_token) => {
2830
+ localStorage.setItem("refreshToken", refresh_token);
2831
+ };
2832
+ const getAccessToken = async () => {
2833
+ return localStorage.getItem("accessToken");
2834
+ };
2835
+ const getRefreshToken = async () => {
2836
+ return localStorage.getItem("refreshToken");
2837
+ };
2838
+ const clearToken = async () => {
2839
+ localStorage.removeItem("accessToken");
2840
+ localStorage.removeItem("refreshToken");
2841
+ };
2842
+ return {
2843
+ setToken,
2844
+ setRefreshToken,
2845
+ getAccessToken,
2846
+ getRefreshToken,
2847
+ clearToken
2848
+ };
2849
+ };
2850
+
2851
+ // src/utils/storage/session-storage.ts
2852
+ var sessionStorageUtils = () => {
2853
+ const getBrowserSession = async () => {
2854
+ return sessionStorage.getItem("browserSession");
2855
+ };
2856
+ return {
2857
+ getBrowserSession
2858
+ };
2859
+ };
2860
+
2861
+ // src/configs/axios-client.ts
2862
+ var axiosClient = {
2863
+ init(config) {
2864
+ const localStorage2 = config.localStorageUtils ?? localStorageUtils();
2865
+ const sessionStorage2 = config.sessionStorageUtils ?? sessionStorageUtils();
2866
+ const db = config.db;
2867
+ let isRefreshing = false;
2868
+ let failedQueue = [];
2869
+ const processQueue = (error, token = null) => {
2870
+ failedQueue?.forEach((prom) => {
2871
+ if (error) {
2872
+ prom.reject(error);
2873
+ } else {
2874
+ prom.resolve(token);
2875
+ }
2876
+ });
2877
+ failedQueue = [];
2878
+ };
2879
+ const instance = import_axios.default.create({
2880
+ adapter: import_axios.default.defaults.adapter,
2881
+ baseURL: config.baseUrl,
2882
+ timeout: 5e4,
2883
+ paramsSerializer: (params) => new URLSearchParams(params).toString()
2884
+ });
2885
+ instance.interceptors.request.use(
2886
+ async (config2) => {
2887
+ const useRefreshToken = config2.useRefreshToken;
2888
+ const token = useRefreshToken ? await localStorage2.getRefreshToken() : await localStorage2.getAccessToken();
2889
+ if (token) {
2890
+ config2.headers["Authorization"] = "Bearer " + token;
2891
+ }
2892
+ return config2;
2893
+ },
2894
+ (error) => {
2895
+ Promise.reject(error);
2896
+ }
2897
+ );
2898
+ instance.interceptors.response.use(
2899
+ (response) => {
2900
+ return handleResponse(response);
2901
+ },
2902
+ async (error) => {
2903
+ const handleError3 = async (error2) => {
2904
+ if (!error2.response) {
2905
+ return error2;
2906
+ }
2907
+ const { data } = error2.response;
2908
+ if (data && data.code === 400 && ["invalid_grant"].includes(data.data?.error)) {
2909
+ await clearAuthToken();
2910
+ }
2911
+ return data;
2912
+ };
2913
+ const originalRequest = error.config;
2914
+ if ((error.response?.status === 403 || error.response?.status === 401 || error.response?.status === 404) && ["TOKEN_EXPIRED", "AUTHEN_FAIL", 401, "ERR_2FA_006"].includes(
2915
+ error.response.data.code
2916
+ )) {
2917
+ if (isRefreshing) {
2918
+ return new Promise(function(resolve, reject) {
2919
+ failedQueue.push({ resolve, reject });
2920
+ }).then((token) => {
2921
+ originalRequest.headers["Authorization"] = "Bearer " + token;
2922
+ originalRequest.data = updateTokenParamInOriginalRequest(
2923
+ originalRequest,
2924
+ token
2925
+ );
2926
+ return instance.request(originalRequest);
2927
+ }).catch(async (err) => {
2928
+ if ((err.response?.status === 400 || err.response?.status === 401) && ["invalid_grant"].includes(err.response.data.error)) {
2929
+ await clearAuthToken();
2930
+ }
2931
+ });
2932
+ }
2933
+ const browserSession = await sessionStorage2.getBrowserSession();
2934
+ const refreshToken = await localStorage2.getRefreshToken();
2935
+ const accessTokenExp = await localStorage2.getAccessToken();
2936
+ isRefreshing = true;
2937
+ if (!refreshToken && (!browserSession || browserSession == "unActive")) {
2938
+ await clearAuthToken();
2939
+ } else {
2940
+ const payload = Object.fromEntries(
2941
+ Object.entries({
2942
+ refresh_token: refreshToken,
2943
+ grant_type: "refresh_token",
2944
+ client_id: config.config.clientId,
2945
+ client_secret: config.config.clientSecret
2946
+ }).filter(([_, value]) => !!value)
2947
+ );
2948
+ return new Promise(function(resolve) {
2949
+ import_axios.default.post(
2950
+ `${config.baseUrl}${config.refreshTokenEndpoint ?? "/authentication/oauth2/token" /* AUTH_TOKEN_PATH */}`,
2951
+ payload,
2952
+ {
2953
+ headers: {
2954
+ "Content-Type": config.refreshTokenEndpoint ? "application/x-www-form-urlencoded" : "multipart/form-data",
2955
+ Authorization: `Bearer ${accessTokenExp}`
2956
+ }
2957
+ }
2958
+ ).then(async (res) => {
2959
+ const data = res.data;
2960
+ await localStorage2.setToken(data.access_token);
2961
+ await localStorage2.setRefreshToken(data.refresh_token);
2962
+ import_axios.default.defaults.headers.common["Authorization"] = "Bearer " + data.access_token;
2963
+ originalRequest.headers["Authorization"] = "Bearer " + data.access_token;
2964
+ originalRequest.data = updateTokenParamInOriginalRequest(
2965
+ originalRequest,
2966
+ data.access_token
2967
+ );
2968
+ processQueue(null, data.access_token);
2969
+ resolve(instance.request(originalRequest));
2970
+ }).catch(async (err) => {
2971
+ 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") {
2972
+ await clearAuthToken();
2973
+ }
2974
+ if (err && err.response) {
2975
+ const { error_code } = err.response?.data || {};
2976
+ if (error_code === "AUTHEN_FAIL") {
2977
+ await clearAuthToken();
2978
+ }
2979
+ }
2980
+ processQueue(err, null);
2981
+ }).finally(() => {
2982
+ isRefreshing = false;
2983
+ });
2984
+ });
2985
+ }
2986
+ }
2987
+ return Promise.reject(await handleError3(error));
2988
+ }
2989
+ );
2990
+ const handleResponse = (res) => {
2991
+ if (res && res.data) {
2992
+ return res.data;
2993
+ }
2994
+ return res;
2995
+ };
2996
+ const handleError2 = (error) => {
2997
+ if (error.isAxiosError && error.code === "ECONNABORTED") {
2998
+ console.error("Request Timeout Error:", error);
2999
+ return "Request Timeout Error";
3000
+ } else if (error.isAxiosError && !error.response) {
3001
+ console.error("Network Error:", error);
3002
+ return "Network Error";
3003
+ } else {
3004
+ console.error("Other Error:", error?.response);
3005
+ const errorMessage = error?.response?.data?.message || "An error occurred";
3006
+ return { message: errorMessage, status: error?.response?.status };
3007
+ }
3008
+ };
3009
+ const clearAuthToken = async () => {
3010
+ await localStorage2.clearToken();
3011
+ if (typeof window !== "undefined") {
3012
+ window.location.href = `/login`;
3013
+ }
3014
+ };
3015
+ function formatUrl(url, db2) {
3016
+ return url + (db2 ? "?db=" + db2 : "");
3017
+ }
3018
+ const responseBody = (response) => response;
3019
+ const requests = {
3020
+ get: (url, headers) => instance.get(formatUrl(url, db), headers).then(responseBody),
3021
+ post: (url, body, headers) => instance.post(formatUrl(url, db), body, headers).then(responseBody),
3022
+ post_excel: (url, body, headers) => instance.post(formatUrl(url, db), body, {
3023
+ responseType: "arraybuffer",
3024
+ headers: {
3025
+ "Content-Type": typeof window !== "undefined" ? "application/json" : "application/javascript",
3026
+ Accept: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
3027
+ }
3028
+ }).then(responseBody),
3029
+ put: (url, body, headers) => instance.put(formatUrl(url, db), body, headers).then(responseBody),
3030
+ patch: (url, body) => instance.patch(formatUrl(url, db), body).then(responseBody),
3031
+ delete: (url, body) => instance.delete(formatUrl(url, db), body).then(responseBody)
3032
+ };
3033
+ return requests;
3034
+ }
3035
+ };
2818
3036
 
2819
3037
  // src/environment/EnvStore.ts
3038
+ var EnvStore = class _EnvStore {
3039
+ static instance = null;
3040
+ envStore;
3041
+ baseUrl;
3042
+ requests;
3043
+ context;
3044
+ defaultCompany;
3045
+ config;
3046
+ companies;
3047
+ user;
3048
+ db;
3049
+ localStorageUtils;
3050
+ sessionStorageUtils;
3051
+ refreshTokenEndpoint;
3052
+ constructor(envStore2, localStorageUtils2, sessionStorageUtils2) {
3053
+ this.envStore = envStore2;
3054
+ this.localStorageUtils = localStorageUtils2;
3055
+ this.sessionStorageUtils = sessionStorageUtils2;
3056
+ this.setup();
3057
+ }
3058
+ static getInstance(envStore2, localStorageUtils2, sessionStorageUtils2) {
3059
+ if (!_EnvStore.instance) {
3060
+ console.log("Creating new EnvStore instance");
3061
+ _EnvStore.instance = new _EnvStore(envStore2, localStorageUtils2, sessionStorageUtils2);
3062
+ } else {
3063
+ console.log("Returning existing EnvStore instance");
3064
+ }
3065
+ return _EnvStore.instance;
3066
+ }
3067
+ setup() {
3068
+ const env = this.envStore.getState().env;
3069
+ console.log("Redux env state in A1:", env);
3070
+ this.baseUrl = env?.baseUrl;
3071
+ this.requests = env?.requests;
3072
+ this.context = env?.context;
3073
+ this.defaultCompany = env?.defaultCompany;
3074
+ this.config = env?.config;
3075
+ this.companies = env?.companies || [];
3076
+ this.user = env?.user;
3077
+ this.db = env?.db;
3078
+ this.refreshTokenEndpoint = env?.refreshTokenEndpoint;
3079
+ console.log("Env setup in A1:", this);
3080
+ }
3081
+ setupEnv(envConfig) {
3082
+ const dispatch = this.envStore.dispatch;
3083
+ const env = {
3084
+ ...envConfig,
3085
+ localStorageUtils: this.localStorageUtils,
3086
+ sessionStorageUtils: this.sessionStorageUtils
3087
+ };
3088
+ console.log("Setting up env with config:", envConfig);
3089
+ const requests = axiosClient.init(env);
3090
+ console.log("axiosClient.init result:", requests);
3091
+ dispatch(setEnv({ ...env, requests }));
3092
+ this.setup();
3093
+ }
3094
+ setUid(uid) {
3095
+ const dispatch = this.envStore.dispatch;
3096
+ dispatch(setUid(uid));
3097
+ this.setup();
3098
+ }
3099
+ setLang(lang) {
3100
+ const dispatch = this.envStore.dispatch;
3101
+ dispatch(setLang(lang));
3102
+ this.setup();
3103
+ }
3104
+ setAllowCompanies(allowCompanies) {
3105
+ const dispatch = this.envStore.dispatch;
3106
+ dispatch(setAllowCompanies(allowCompanies));
3107
+ this.setup();
3108
+ }
3109
+ setCompanies(companies) {
3110
+ const dispatch = this.envStore.dispatch;
3111
+ dispatch(setCompanies(companies));
3112
+ this.setup();
3113
+ }
3114
+ setDefaultCompany(company) {
3115
+ const dispatch = this.envStore.dispatch;
3116
+ dispatch(setDefaultCompany(company));
3117
+ this.setup();
3118
+ }
3119
+ setUserInfo(userInfo) {
3120
+ const dispatch = this.envStore.dispatch;
3121
+ dispatch(setUser(userInfo));
3122
+ this.setup();
3123
+ }
3124
+ };
2820
3125
  function getEnv() {
2821
- console.log("getEnv", envStore.getState().env);
2822
- return envStore.getState().env;
3126
+ const instance = EnvStore.getInstance(envStore);
3127
+ if (!instance) {
3128
+ throw new Error("EnvStore has not been initialized \u2014 call initEnv() first");
3129
+ }
3130
+ return instance;
2823
3131
  }
2824
3132
 
2825
3133
  // src/services/view-service/index.ts
@@ -3083,7 +3391,8 @@ var ViewService = {
3083
3391
  },
3084
3392
  async getVersion() {
3085
3393
  const env = getEnv();
3086
- return env?.requests.get("", {
3394
+ console.log("env?.requests", env, env?.requests);
3395
+ return env?.requests?.get("", {
3087
3396
  headers: {
3088
3397
  "Content-Type": "application/json"
3089
3398
  }
@@ -3280,6 +3589,7 @@ var VersionGate = ({ children }) => {
3280
3589
  };
3281
3590
  const validateVersion = async () => {
3282
3591
  const serverVersion = await view_service_default.getVersion();
3592
+ console.log("serverVersion", serverVersion);
3283
3593
  const cached = localStorage.getItem("__api_version__");
3284
3594
  if (cached !== serverVersion?.api_version) {
3285
3595
  clearVersion();