@fctc/interface-logic 1.5.4 → 1.5.5
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/configs.js +96 -107
- package/dist/configs.mjs +96 -108
- package/dist/environment.js +122 -137
- package/dist/environment.mjs +122 -140
- package/dist/hooks.js +1396 -1559
- package/dist/hooks.mjs +1396 -1562
- package/dist/provider.d.mts +3 -4
- package/dist/provider.d.ts +3 -4
- package/dist/provider.js +509 -562
- package/dist/provider.mjs +509 -565
- package/dist/services.js +1359 -1524
- package/dist/services.mjs +1355 -1523
- package/dist/store.js +5 -19
- package/dist/store.mjs +5 -22
- package/dist/utils.js +94 -116
- package/dist/utils.mjs +94 -119
- package/package.json +11 -22
package/dist/environment.js
CHANGED
|
@@ -1,28 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __create = Object.create;
|
|
3
3
|
var __defProp = Object.defineProperty;
|
|
4
|
-
var __defProps = Object.defineProperties;
|
|
5
4
|
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
6
|
-
var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
|
|
7
5
|
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
8
|
-
var __getOwnPropSymbols = Object.getOwnPropertySymbols;
|
|
9
6
|
var __getProtoOf = Object.getPrototypeOf;
|
|
10
7
|
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
11
|
-
var __propIsEnum = Object.prototype.propertyIsEnumerable;
|
|
12
|
-
var __pow = Math.pow;
|
|
13
|
-
var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
|
|
14
|
-
var __spreadValues = (a, b) => {
|
|
15
|
-
for (var prop in b || (b = {}))
|
|
16
|
-
if (__hasOwnProp.call(b, prop))
|
|
17
|
-
__defNormalProp(a, prop, b[prop]);
|
|
18
|
-
if (__getOwnPropSymbols)
|
|
19
|
-
for (var prop of __getOwnPropSymbols(b)) {
|
|
20
|
-
if (__propIsEnum.call(b, prop))
|
|
21
|
-
__defNormalProp(a, prop, b[prop]);
|
|
22
|
-
}
|
|
23
|
-
return a;
|
|
24
|
-
};
|
|
25
|
-
var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
|
|
26
8
|
var __export = (target, all) => {
|
|
27
9
|
for (var name in all)
|
|
28
10
|
__defProp(target, name, { get: all[name], enumerable: true });
|
|
@@ -44,26 +26,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
|
|
|
44
26
|
mod
|
|
45
27
|
));
|
|
46
28
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
47
|
-
var __async = (__this, __arguments, generator) => {
|
|
48
|
-
return new Promise((resolve, reject) => {
|
|
49
|
-
var fulfilled = (value) => {
|
|
50
|
-
try {
|
|
51
|
-
step(generator.next(value));
|
|
52
|
-
} catch (e) {
|
|
53
|
-
reject(e);
|
|
54
|
-
}
|
|
55
|
-
};
|
|
56
|
-
var rejected = (value) => {
|
|
57
|
-
try {
|
|
58
|
-
step(generator.throw(value));
|
|
59
|
-
} catch (e) {
|
|
60
|
-
reject(e);
|
|
61
|
-
}
|
|
62
|
-
};
|
|
63
|
-
var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
|
|
64
|
-
step((generator = generator.apply(__this, __arguments)).next());
|
|
65
|
-
});
|
|
66
|
-
};
|
|
67
29
|
|
|
68
30
|
// src/environment.ts
|
|
69
31
|
var environment_exports = {};
|
|
@@ -1159,6 +1121,22 @@ var PyRelativeDelta = class _PyRelativeDelta {
|
|
|
1159
1121
|
this.microsecond = params.microsecond;
|
|
1160
1122
|
this.weekday = params.weekday;
|
|
1161
1123
|
}
|
|
1124
|
+
years;
|
|
1125
|
+
months;
|
|
1126
|
+
days;
|
|
1127
|
+
hours;
|
|
1128
|
+
minutes;
|
|
1129
|
+
seconds;
|
|
1130
|
+
microseconds;
|
|
1131
|
+
leapDays;
|
|
1132
|
+
year;
|
|
1133
|
+
month;
|
|
1134
|
+
day;
|
|
1135
|
+
hour;
|
|
1136
|
+
minute;
|
|
1137
|
+
second;
|
|
1138
|
+
microsecond;
|
|
1139
|
+
weekday;
|
|
1162
1140
|
negate() {
|
|
1163
1141
|
return new _PyRelativeDelta(this, -1);
|
|
1164
1142
|
}
|
|
@@ -1273,7 +1251,7 @@ function execOnIterable(iterable, func) {
|
|
|
1273
1251
|
if (typeof iterable === "object" && !Array.isArray(iterable) && !(iterable instanceof Set)) {
|
|
1274
1252
|
iterable = Object.keys(iterable);
|
|
1275
1253
|
}
|
|
1276
|
-
if (typeof
|
|
1254
|
+
if (typeof iterable?.[Symbol.iterator] !== "function") {
|
|
1277
1255
|
throw new EvaluationError("value not iterable");
|
|
1278
1256
|
}
|
|
1279
1257
|
return func(iterable);
|
|
@@ -1596,7 +1574,7 @@ function applyBinaryOp(ast, context) {
|
|
|
1596
1574
|
}
|
|
1597
1575
|
return Math.floor(left / right);
|
|
1598
1576
|
case "**":
|
|
1599
|
-
return
|
|
1577
|
+
return left ** right;
|
|
1600
1578
|
case "==":
|
|
1601
1579
|
return isEqual(left, right);
|
|
1602
1580
|
case "<>":
|
|
@@ -1718,7 +1696,7 @@ function evaluate(ast, context = {}) {
|
|
|
1718
1696
|
const dicts = /* @__PURE__ */ new Set();
|
|
1719
1697
|
let pyContext;
|
|
1720
1698
|
const evalContext = Object.create(context);
|
|
1721
|
-
if (!
|
|
1699
|
+
if (!evalContext?.context) {
|
|
1722
1700
|
Object.defineProperty(evalContext, "context", {
|
|
1723
1701
|
get() {
|
|
1724
1702
|
if (!pyContext) {
|
|
@@ -1729,18 +1707,17 @@ function evaluate(ast, context = {}) {
|
|
|
1729
1707
|
});
|
|
1730
1708
|
}
|
|
1731
1709
|
function _innerEvaluate(ast2) {
|
|
1732
|
-
|
|
1733
|
-
switch (ast2 == null ? void 0 : ast2.type) {
|
|
1710
|
+
switch (ast2?.type) {
|
|
1734
1711
|
case 0:
|
|
1735
1712
|
// Number
|
|
1736
1713
|
case 1:
|
|
1737
1714
|
return ast2.value;
|
|
1738
1715
|
case 5:
|
|
1739
1716
|
if (ast2.value in evalContext) {
|
|
1740
|
-
if (typeof evalContext[ast2.value] === "object" &&
|
|
1741
|
-
return
|
|
1717
|
+
if (typeof evalContext[ast2.value] === "object" && evalContext[ast2.value]?.id) {
|
|
1718
|
+
return evalContext[ast2.value]?.id;
|
|
1742
1719
|
}
|
|
1743
|
-
return
|
|
1720
|
+
return evalContext[ast2.value] ?? false;
|
|
1744
1721
|
} else if (ast2.value in BUILTINS) {
|
|
1745
1722
|
return BUILTINS[ast2.value];
|
|
1746
1723
|
} else {
|
|
@@ -1777,7 +1754,7 @@ function evaluate(ast, context = {}) {
|
|
|
1777
1754
|
const args = ast2.args.map(_evaluate);
|
|
1778
1755
|
const kwargs = {};
|
|
1779
1756
|
for (const kwarg in ast2.kwargs) {
|
|
1780
|
-
kwargs[kwarg] = _evaluate(ast2
|
|
1757
|
+
kwargs[kwarg] = _evaluate(ast2?.kwargs[kwarg]);
|
|
1781
1758
|
}
|
|
1782
1759
|
if (fnValue === PyDate || fnValue === PyDateTime || fnValue === PyTime || fnValue === PyRelativeDelta || fnValue === PyTimeDelta) {
|
|
1783
1760
|
return fnValue.create(...args, kwargs);
|
|
@@ -1856,25 +1833,9 @@ function escapeRegExp(str) {
|
|
|
1856
1833
|
var InvalidDomainError = class extends Error {
|
|
1857
1834
|
};
|
|
1858
1835
|
var Domain = class _Domain {
|
|
1859
|
-
|
|
1860
|
-
|
|
1861
|
-
|
|
1862
|
-
return new _Domain(descr.toString());
|
|
1863
|
-
} else {
|
|
1864
|
-
let rawAST;
|
|
1865
|
-
try {
|
|
1866
|
-
rawAST = typeof descr === "string" ? parseExpr(descr) : toAST(descr);
|
|
1867
|
-
} catch (error) {
|
|
1868
|
-
throw new InvalidDomainError(
|
|
1869
|
-
`Invalid domain representation: ${descr}`,
|
|
1870
|
-
{
|
|
1871
|
-
cause: error
|
|
1872
|
-
}
|
|
1873
|
-
);
|
|
1874
|
-
}
|
|
1875
|
-
this.ast = normalizeDomainAST(rawAST);
|
|
1876
|
-
}
|
|
1877
|
-
}
|
|
1836
|
+
ast = { type: -1, value: null };
|
|
1837
|
+
static TRUE;
|
|
1838
|
+
static FALSE;
|
|
1878
1839
|
static combine(domains, operator) {
|
|
1879
1840
|
if (domains.length === 0) {
|
|
1880
1841
|
return new _Domain([]);
|
|
@@ -1953,6 +1914,24 @@ var Domain = class _Domain {
|
|
|
1953
1914
|
processLeaf(d.ast.value, 0, "&", newDomain);
|
|
1954
1915
|
return newDomain;
|
|
1955
1916
|
}
|
|
1917
|
+
constructor(descr = []) {
|
|
1918
|
+
if (descr instanceof _Domain) {
|
|
1919
|
+
return new _Domain(descr.toString());
|
|
1920
|
+
} else {
|
|
1921
|
+
let rawAST;
|
|
1922
|
+
try {
|
|
1923
|
+
rawAST = typeof descr === "string" ? parseExpr(descr) : toAST(descr);
|
|
1924
|
+
} catch (error) {
|
|
1925
|
+
throw new InvalidDomainError(
|
|
1926
|
+
`Invalid domain representation: ${descr}`,
|
|
1927
|
+
{
|
|
1928
|
+
cause: error
|
|
1929
|
+
}
|
|
1930
|
+
);
|
|
1931
|
+
}
|
|
1932
|
+
this.ast = normalizeDomainAST(rawAST);
|
|
1933
|
+
}
|
|
1934
|
+
}
|
|
1956
1935
|
contains(record) {
|
|
1957
1936
|
const expr = evaluate(this.ast, record);
|
|
1958
1937
|
return matchDomain(record, expr);
|
|
@@ -1971,7 +1950,7 @@ var Domain = class _Domain {
|
|
|
1971
1950
|
return evaluatedAsList;
|
|
1972
1951
|
}
|
|
1973
1952
|
return this.toString();
|
|
1974
|
-
} catch
|
|
1953
|
+
} catch {
|
|
1975
1954
|
return this.toString();
|
|
1976
1955
|
}
|
|
1977
1956
|
}
|
|
@@ -2194,22 +2173,22 @@ var updateTokenParamInOriginalRequest = (originalRequest, newAccessToken) => {
|
|
|
2194
2173
|
|
|
2195
2174
|
// src/utils/storage/local-storage.ts
|
|
2196
2175
|
var localStorageUtils = () => {
|
|
2197
|
-
const setToken = (access_token) =>
|
|
2176
|
+
const setToken = async (access_token) => {
|
|
2198
2177
|
localStorage.setItem("accessToken", access_token);
|
|
2199
|
-
}
|
|
2200
|
-
const setRefreshToken = (refresh_token) =>
|
|
2178
|
+
};
|
|
2179
|
+
const setRefreshToken = async (refresh_token) => {
|
|
2201
2180
|
localStorage.setItem("refreshToken", refresh_token);
|
|
2202
|
-
}
|
|
2203
|
-
const getAccessToken = () =>
|
|
2181
|
+
};
|
|
2182
|
+
const getAccessToken = async () => {
|
|
2204
2183
|
return localStorage.getItem("accessToken");
|
|
2205
|
-
}
|
|
2206
|
-
const getRefreshToken = () =>
|
|
2184
|
+
};
|
|
2185
|
+
const getRefreshToken = async () => {
|
|
2207
2186
|
return localStorage.getItem("refreshToken");
|
|
2208
|
-
}
|
|
2209
|
-
const clearToken = () =>
|
|
2187
|
+
};
|
|
2188
|
+
const clearToken = async () => {
|
|
2210
2189
|
localStorage.removeItem("accessToken");
|
|
2211
2190
|
localStorage.removeItem("refreshToken");
|
|
2212
|
-
}
|
|
2191
|
+
};
|
|
2213
2192
|
return {
|
|
2214
2193
|
setToken,
|
|
2215
2194
|
setRefreshToken,
|
|
@@ -2221,9 +2200,9 @@ var localStorageUtils = () => {
|
|
|
2221
2200
|
|
|
2222
2201
|
// src/utils/storage/session-storage.ts
|
|
2223
2202
|
var sessionStorageUtils = () => {
|
|
2224
|
-
const getBrowserSession = () =>
|
|
2203
|
+
const getBrowserSession = async () => {
|
|
2225
2204
|
return sessionStorage.getItem("browserSession");
|
|
2226
|
-
}
|
|
2205
|
+
};
|
|
2227
2206
|
return {
|
|
2228
2207
|
getBrowserSession
|
|
2229
2208
|
};
|
|
@@ -2232,14 +2211,13 @@ var sessionStorageUtils = () => {
|
|
|
2232
2211
|
// src/configs/axios-client.ts
|
|
2233
2212
|
var axiosClient = {
|
|
2234
2213
|
init(config) {
|
|
2235
|
-
|
|
2236
|
-
const
|
|
2237
|
-
const sessionStorage2 = (_b = config.sessionStorageUtils) != null ? _b : sessionStorageUtils();
|
|
2214
|
+
const localStorage2 = config.localStorageUtils ?? localStorageUtils();
|
|
2215
|
+
const sessionStorage2 = config.sessionStorageUtils ?? sessionStorageUtils();
|
|
2238
2216
|
const db = config.db;
|
|
2239
2217
|
let isRefreshing = false;
|
|
2240
2218
|
let failedQueue = [];
|
|
2241
2219
|
const processQueue = (error, token = null) => {
|
|
2242
|
-
failedQueue
|
|
2220
|
+
failedQueue?.forEach((prom) => {
|
|
2243
2221
|
if (error) {
|
|
2244
2222
|
prom.reject(error);
|
|
2245
2223
|
} else {
|
|
@@ -2255,14 +2233,14 @@ var axiosClient = {
|
|
|
2255
2233
|
paramsSerializer: (params) => new URLSearchParams(params).toString()
|
|
2256
2234
|
});
|
|
2257
2235
|
instance.interceptors.request.use(
|
|
2258
|
-
(config2) =>
|
|
2236
|
+
async (config2) => {
|
|
2259
2237
|
const useRefreshToken = config2.useRefreshToken;
|
|
2260
|
-
const token = useRefreshToken ?
|
|
2238
|
+
const token = useRefreshToken ? await localStorage2.getRefreshToken() : await localStorage2.getAccessToken();
|
|
2261
2239
|
if (token) {
|
|
2262
2240
|
config2.headers["Authorization"] = "Bearer " + token;
|
|
2263
2241
|
}
|
|
2264
2242
|
return config2;
|
|
2265
|
-
}
|
|
2243
|
+
},
|
|
2266
2244
|
(error) => {
|
|
2267
2245
|
Promise.reject(error);
|
|
2268
2246
|
}
|
|
@@ -2271,21 +2249,19 @@ var axiosClient = {
|
|
|
2271
2249
|
(response) => {
|
|
2272
2250
|
return handleResponse(response);
|
|
2273
2251
|
},
|
|
2274
|
-
(error) =>
|
|
2275
|
-
|
|
2276
|
-
const handleError3 = (error2) => __async(null, null, function* () {
|
|
2277
|
-
var _a3;
|
|
2252
|
+
async (error) => {
|
|
2253
|
+
const handleError3 = async (error2) => {
|
|
2278
2254
|
if (!error2.response) {
|
|
2279
2255
|
return error2;
|
|
2280
2256
|
}
|
|
2281
2257
|
const { data } = error2.response;
|
|
2282
|
-
if (data && data.code === 400 && ["invalid_grant"].includes(
|
|
2283
|
-
|
|
2258
|
+
if (data && data.code === 400 && ["invalid_grant"].includes(data.data?.error)) {
|
|
2259
|
+
await clearAuthToken();
|
|
2284
2260
|
}
|
|
2285
2261
|
return data;
|
|
2286
|
-
}
|
|
2262
|
+
};
|
|
2287
2263
|
const originalRequest = error.config;
|
|
2288
|
-
if ((
|
|
2264
|
+
if ((error.response?.status === 403 || error.response?.status === 401 || error.response?.status === 404) && ["TOKEN_EXPIRED", "AUTHEN_FAIL", 401, "ERR_2FA_006"].includes(
|
|
2289
2265
|
error.response.data.code
|
|
2290
2266
|
)) {
|
|
2291
2267
|
if (isRefreshing) {
|
|
@@ -2298,19 +2274,18 @@ var axiosClient = {
|
|
|
2298
2274
|
token
|
|
2299
2275
|
);
|
|
2300
2276
|
return instance.request(originalRequest);
|
|
2301
|
-
}).catch((err) =>
|
|
2302
|
-
|
|
2303
|
-
|
|
2304
|
-
yield clearAuthToken();
|
|
2277
|
+
}).catch(async (err) => {
|
|
2278
|
+
if ((err.response?.status === 400 || err.response?.status === 401) && ["invalid_grant"].includes(err.response.data.error)) {
|
|
2279
|
+
await clearAuthToken();
|
|
2305
2280
|
}
|
|
2306
|
-
})
|
|
2281
|
+
});
|
|
2307
2282
|
}
|
|
2308
|
-
const browserSession =
|
|
2309
|
-
const refreshToken =
|
|
2310
|
-
const accessTokenExp =
|
|
2283
|
+
const browserSession = await sessionStorage2.getBrowserSession();
|
|
2284
|
+
const refreshToken = await localStorage2.getRefreshToken();
|
|
2285
|
+
const accessTokenExp = await localStorage2.getAccessToken();
|
|
2311
2286
|
isRefreshing = true;
|
|
2312
2287
|
if (!refreshToken && (!browserSession || browserSession == "unActive")) {
|
|
2313
|
-
|
|
2288
|
+
await clearAuthToken();
|
|
2314
2289
|
} else {
|
|
2315
2290
|
const payload = Object.fromEntries(
|
|
2316
2291
|
Object.entries({
|
|
@@ -2321,9 +2296,8 @@ var axiosClient = {
|
|
|
2321
2296
|
}).filter(([_, value]) => !!value)
|
|
2322
2297
|
);
|
|
2323
2298
|
return new Promise(function(resolve) {
|
|
2324
|
-
var _a3;
|
|
2325
2299
|
import_axios.default.post(
|
|
2326
|
-
`${config.baseUrl}${
|
|
2300
|
+
`${config.baseUrl}${config.refreshTokenEndpoint ?? "/authentication/oauth2/token" /* AUTH_TOKEN_PATH */}`,
|
|
2327
2301
|
payload,
|
|
2328
2302
|
{
|
|
2329
2303
|
headers: {
|
|
@@ -2331,10 +2305,10 @@ var axiosClient = {
|
|
|
2331
2305
|
Authorization: `Bearer ${accessTokenExp}`
|
|
2332
2306
|
}
|
|
2333
2307
|
}
|
|
2334
|
-
).then((res) =>
|
|
2308
|
+
).then(async (res) => {
|
|
2335
2309
|
const data = res.data;
|
|
2336
|
-
|
|
2337
|
-
|
|
2310
|
+
await localStorage2.setToken(data.access_token);
|
|
2311
|
+
await localStorage2.setRefreshToken(data.refresh_token);
|
|
2338
2312
|
import_axios.default.defaults.headers.common["Authorization"] = "Bearer " + data.access_token;
|
|
2339
2313
|
originalRequest.headers["Authorization"] = "Bearer " + data.access_token;
|
|
2340
2314
|
originalRequest.data = updateTokenParamInOriginalRequest(
|
|
@@ -2343,26 +2317,25 @@ var axiosClient = {
|
|
|
2343
2317
|
);
|
|
2344
2318
|
processQueue(null, data.access_token);
|
|
2345
2319
|
resolve(instance.request(originalRequest));
|
|
2346
|
-
})
|
|
2347
|
-
|
|
2348
|
-
|
|
2349
|
-
yield clearAuthToken();
|
|
2320
|
+
}).catch(async (err) => {
|
|
2321
|
+
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") {
|
|
2322
|
+
await clearAuthToken();
|
|
2350
2323
|
}
|
|
2351
2324
|
if (err && err.response) {
|
|
2352
|
-
const { error_code } =
|
|
2325
|
+
const { error_code } = err.response?.data || {};
|
|
2353
2326
|
if (error_code === "AUTHEN_FAIL") {
|
|
2354
|
-
|
|
2327
|
+
await clearAuthToken();
|
|
2355
2328
|
}
|
|
2356
2329
|
}
|
|
2357
2330
|
processQueue(err, null);
|
|
2358
|
-
})
|
|
2331
|
+
}).finally(() => {
|
|
2359
2332
|
isRefreshing = false;
|
|
2360
2333
|
});
|
|
2361
2334
|
});
|
|
2362
2335
|
}
|
|
2363
2336
|
}
|
|
2364
|
-
return Promise.reject(
|
|
2365
|
-
}
|
|
2337
|
+
return Promise.reject(await handleError3(error));
|
|
2338
|
+
}
|
|
2366
2339
|
);
|
|
2367
2340
|
const handleResponse = (res) => {
|
|
2368
2341
|
if (res && res.data) {
|
|
@@ -2371,7 +2344,6 @@ var axiosClient = {
|
|
|
2371
2344
|
return res;
|
|
2372
2345
|
};
|
|
2373
2346
|
const handleError2 = (error) => {
|
|
2374
|
-
var _a2, _b2, _c;
|
|
2375
2347
|
if (error.isAxiosError && error.code === "ECONNABORTED") {
|
|
2376
2348
|
console.error("Request Timeout Error:", error);
|
|
2377
2349
|
return "Request Timeout Error";
|
|
@@ -2379,17 +2351,17 @@ var axiosClient = {
|
|
|
2379
2351
|
console.error("Network Error:", error);
|
|
2380
2352
|
return "Network Error";
|
|
2381
2353
|
} else {
|
|
2382
|
-
console.error("Other Error:", error
|
|
2383
|
-
const errorMessage =
|
|
2384
|
-
return { message: errorMessage, status:
|
|
2354
|
+
console.error("Other Error:", error?.response);
|
|
2355
|
+
const errorMessage = error?.response?.data?.message || "An error occurred";
|
|
2356
|
+
return { message: errorMessage, status: error?.response?.status };
|
|
2385
2357
|
}
|
|
2386
2358
|
};
|
|
2387
|
-
const clearAuthToken = () =>
|
|
2388
|
-
|
|
2359
|
+
const clearAuthToken = async () => {
|
|
2360
|
+
await localStorage2.clearToken();
|
|
2389
2361
|
if (typeof window !== "undefined") {
|
|
2390
2362
|
window.location.href = `/login`;
|
|
2391
2363
|
}
|
|
2392
|
-
}
|
|
2364
|
+
};
|
|
2393
2365
|
function formatUrl(url, db2) {
|
|
2394
2366
|
return url + (db2 ? "?db=" + db2 : "");
|
|
2395
2367
|
}
|
|
@@ -2602,7 +2574,7 @@ var headerSlice = (0, import_toolkit5.createSlice)({
|
|
|
2602
2574
|
},
|
|
2603
2575
|
reducers: {
|
|
2604
2576
|
setHeader: (state, action) => {
|
|
2605
|
-
state.value =
|
|
2577
|
+
state.value = { ...state.value, ...action.payload };
|
|
2606
2578
|
},
|
|
2607
2579
|
setAllowedCompanyIds: (state, action) => {
|
|
2608
2580
|
state.value.allowedCompanyIds = action.payload;
|
|
@@ -3028,6 +3000,18 @@ var envStore = (0, import_toolkit11.configureStore)({
|
|
|
3028
3000
|
|
|
3029
3001
|
// src/environment/EnvStore.ts
|
|
3030
3002
|
var EnvStore = class {
|
|
3003
|
+
envStore;
|
|
3004
|
+
baseUrl;
|
|
3005
|
+
requests;
|
|
3006
|
+
context;
|
|
3007
|
+
defaultCompany;
|
|
3008
|
+
config;
|
|
3009
|
+
companies;
|
|
3010
|
+
user;
|
|
3011
|
+
db;
|
|
3012
|
+
localStorageUtils;
|
|
3013
|
+
sessionStorageUtils;
|
|
3014
|
+
refreshTokenEndpoint;
|
|
3031
3015
|
constructor(envStore2, localStorageUtils2, sessionStorageUtils2) {
|
|
3032
3016
|
this.envStore = envStore2;
|
|
3033
3017
|
this.localStorageUtils = localStorageUtils2;
|
|
@@ -3036,24 +3020,25 @@ var EnvStore = class {
|
|
|
3036
3020
|
}
|
|
3037
3021
|
setup() {
|
|
3038
3022
|
const env2 = this.envStore.getState().env;
|
|
3039
|
-
this.baseUrl = env2
|
|
3040
|
-
this.requests = env2
|
|
3041
|
-
this.context = env2
|
|
3042
|
-
this.defaultCompany = env2
|
|
3043
|
-
this.config = env2
|
|
3044
|
-
this.companies =
|
|
3045
|
-
this.user = env2
|
|
3046
|
-
this.db = env2
|
|
3047
|
-
this.refreshTokenEndpoint = env2
|
|
3023
|
+
this.baseUrl = env2?.baseUrl;
|
|
3024
|
+
this.requests = env2?.requests;
|
|
3025
|
+
this.context = env2?.context;
|
|
3026
|
+
this.defaultCompany = env2?.defaultCompany;
|
|
3027
|
+
this.config = env2?.config;
|
|
3028
|
+
this.companies = env2?.companies || [];
|
|
3029
|
+
this.user = env2?.user;
|
|
3030
|
+
this.db = env2?.db;
|
|
3031
|
+
this.refreshTokenEndpoint = env2?.refreshTokenEndpoint;
|
|
3048
3032
|
}
|
|
3049
3033
|
setupEnv(envConfig) {
|
|
3050
3034
|
const dispatch = this.envStore.dispatch;
|
|
3051
|
-
const env2 =
|
|
3035
|
+
const env2 = {
|
|
3036
|
+
...envConfig,
|
|
3052
3037
|
localStorageUtils: this.localStorageUtils,
|
|
3053
3038
|
sessionStorageUtils: this.sessionStorageUtils
|
|
3054
|
-
}
|
|
3039
|
+
};
|
|
3055
3040
|
const requests = axiosClient.init(env2);
|
|
3056
|
-
dispatch(setEnv(
|
|
3041
|
+
dispatch(setEnv({ ...env2, requests }));
|
|
3057
3042
|
this.setup();
|
|
3058
3043
|
}
|
|
3059
3044
|
setUid(uid) {
|