@fctc/edu-logic-lib 1.1.9 → 1.2.0
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/{chunk-6QXB3XX7.mjs → chunk-227GQM56.mjs} +53 -14
- package/dist/{chunk-UY6GNZNB.js → chunk-3B6NWGPJ.js} +54 -13
- package/dist/{chunk-FVGPSTJ7.js → chunk-3GSWPBI3.js} +2 -2
- package/dist/{chunk-YOV6KAT2.js → chunk-56VJGYA5.js} +2 -2
- package/dist/{chunk-EK43MEN4.js → chunk-5CWLH3IT.js} +52 -52
- package/dist/{chunk-AYUH66EE.mjs → chunk-A3OMRS6W.mjs} +1 -1
- package/dist/{chunk-6BLY7NZ6.mjs → chunk-HDWNBT3C.mjs} +1 -1
- package/dist/{chunk-CZHZLKNA.mjs → chunk-KYUV2PH4.mjs} +3 -3
- package/dist/{chunk-4K3QAEZ6.js → chunk-ODQQQ7WA.js} +12 -8
- package/dist/{chunk-RWRHCIQI.mjs → chunk-QMO7DJNI.mjs} +2 -2
- package/dist/{chunk-OFUXC2LA.mjs → chunk-QYYFZUNV.mjs} +11 -7
- package/dist/{chunk-XYVK476U.mjs → chunk-TT2ZKGNO.mjs} +2 -2
- package/dist/{chunk-OADBRQ4A.js → chunk-UHYQ7IVO.js} +7 -7
- package/dist/{chunk-P2IGWJDZ.js → chunk-ZAYNNN2Q.js} +47 -47
- package/dist/config.js +2 -2
- package/dist/config.mjs +1 -1
- package/dist/constants.js +10 -10
- package/dist/constants.mjs +1 -1
- package/dist/environment.d.mts +18 -1
- package/dist/environment.d.ts +18 -1
- package/dist/environment.js +6 -6
- package/dist/environment.mjs +2 -2
- package/dist/hooks.js +52 -52
- package/dist/hooks.mjs +7 -7
- package/dist/index.js +98 -98
- package/dist/index.mjs +10 -10
- package/dist/models.js +10 -10
- package/dist/models.mjs +7 -7
- package/dist/provider.js +9 -9
- package/dist/provider.mjs +6 -6
- package/dist/services.js +13 -13
- package/dist/services.mjs +5 -5
- package/dist/types.js +1 -1
- package/dist/types.mjs +1 -1
- package/dist/utils.js +16 -16
- package/dist/utils.mjs +1 -1
- package/package.json +2 -1
- /package/dist/{chunk-7JD5GMIZ.js → chunk-GGNOJ77I.js} +0 -0
- /package/dist/{chunk-S7B3VKMJ.mjs → chunk-IGSNXETE.mjs} +0 -0
- /package/dist/{chunk-ELARQVCE.mjs → chunk-MXBJCI62.mjs} +0 -0
- /package/dist/{chunk-GGOFXFSX.js → chunk-UY632SGY.js} +0 -0
- /package/dist/{chunk-S7YF2I23.js → chunk-UYN3VSHW.js} +0 -0
- /package/dist/{chunk-OBR6UTC5.mjs → chunk-WAXGOBY2.mjs} +0 -0
|
@@ -1,5 +1,44 @@
|
|
|
1
1
|
import axios from 'axios';
|
|
2
2
|
|
|
3
|
+
// src/config/axios-client.ts
|
|
4
|
+
|
|
5
|
+
// src/utils/storage/local-storage.ts
|
|
6
|
+
var localStorageUtils = () => {
|
|
7
|
+
const setToken = async (access_token) => {
|
|
8
|
+
localStorage.setItem("accessToken", access_token);
|
|
9
|
+
};
|
|
10
|
+
const setRefreshToken = async (refresh_token) => {
|
|
11
|
+
localStorage.setItem("refreshToken", refresh_token);
|
|
12
|
+
};
|
|
13
|
+
const getAccessToken = async () => {
|
|
14
|
+
return localStorage.getItem("accessToken");
|
|
15
|
+
};
|
|
16
|
+
const getRefreshToken = async () => {
|
|
17
|
+
return localStorage.getItem("refreshToken");
|
|
18
|
+
};
|
|
19
|
+
const clearToken = async () => {
|
|
20
|
+
localStorage.removeItem("accessToken");
|
|
21
|
+
localStorage.removeItem("refreshToken");
|
|
22
|
+
};
|
|
23
|
+
return {
|
|
24
|
+
setToken,
|
|
25
|
+
setRefreshToken,
|
|
26
|
+
getAccessToken,
|
|
27
|
+
getRefreshToken,
|
|
28
|
+
clearToken
|
|
29
|
+
};
|
|
30
|
+
};
|
|
31
|
+
|
|
32
|
+
// src/utils/storage/session-storage.ts
|
|
33
|
+
var sessionStorageUtils = () => {
|
|
34
|
+
const getBrowserSession = async () => {
|
|
35
|
+
return sessionStorage.getItem("browserSession");
|
|
36
|
+
};
|
|
37
|
+
return {
|
|
38
|
+
getBrowserSession
|
|
39
|
+
};
|
|
40
|
+
};
|
|
41
|
+
|
|
3
42
|
// src/config/axios-client.ts
|
|
4
43
|
var MAINT_KEY = "MAINTENANCE_ACTIVE";
|
|
5
44
|
var MAINT_AT = "MAINTENANCE_AT";
|
|
@@ -47,8 +86,8 @@ async function clearMaintenanceAndExit(getToken, opts) {
|
|
|
47
86
|
}
|
|
48
87
|
var axiosClient = {
|
|
49
88
|
init(config) {
|
|
50
|
-
const
|
|
51
|
-
const
|
|
89
|
+
const localStorage2 = config.localStorageUtils ?? localStorageUtils();
|
|
90
|
+
const sessionStorage2 = config.sessionStorageUtils ?? sessionStorageUtils();
|
|
52
91
|
const db = config.db;
|
|
53
92
|
let isRefreshing = false;
|
|
54
93
|
let failedQueue = [];
|
|
@@ -80,10 +119,10 @@ var axiosClient = {
|
|
|
80
119
|
(async () => {
|
|
81
120
|
try {
|
|
82
121
|
await axios.get(healthUrl, { timeout: 8e3 });
|
|
83
|
-
await clearMaintenanceAndExit(() =>
|
|
122
|
+
await clearMaintenanceAndExit(() => localStorage2.getAccessToken(), {
|
|
84
123
|
forceLogin: true,
|
|
85
124
|
clearTokenOnForce: true,
|
|
86
|
-
clearToken: () =>
|
|
125
|
+
clearToken: () => localStorage2.clearToken()
|
|
87
126
|
});
|
|
88
127
|
} catch {
|
|
89
128
|
}
|
|
@@ -92,7 +131,7 @@ var axiosClient = {
|
|
|
92
131
|
}
|
|
93
132
|
instance.interceptors.request.use(
|
|
94
133
|
async (configReq) => {
|
|
95
|
-
const token = await
|
|
134
|
+
const token = await localStorage2.getAccessToken();
|
|
96
135
|
if (token) {
|
|
97
136
|
configReq.headers["Authorization"] = "Bearer " + token;
|
|
98
137
|
}
|
|
@@ -108,11 +147,11 @@ var axiosClient = {
|
|
|
108
147
|
if (isMaint && onMaintenancePage) {
|
|
109
148
|
(async () => {
|
|
110
149
|
await clearMaintenanceAndExit(
|
|
111
|
-
() =>
|
|
150
|
+
() => localStorage2.getAccessToken(),
|
|
112
151
|
{
|
|
113
152
|
forceLogin: true,
|
|
114
153
|
clearTokenOnForce: true,
|
|
115
|
-
clearToken: () =>
|
|
154
|
+
clearToken: () => localStorage2.clearToken()
|
|
116
155
|
}
|
|
117
156
|
);
|
|
118
157
|
})();
|
|
@@ -166,9 +205,9 @@ var axiosClient = {
|
|
|
166
205
|
}
|
|
167
206
|
});
|
|
168
207
|
}
|
|
169
|
-
const browserSession = await
|
|
170
|
-
const refreshToken = await
|
|
171
|
-
const accessTokenExp = await
|
|
208
|
+
const browserSession = await sessionStorage2.getBrowserSession();
|
|
209
|
+
const refreshToken = await localStorage2.getRefreshToken();
|
|
210
|
+
const accessTokenExp = await localStorage2.getAccessToken();
|
|
172
211
|
isRefreshing = true;
|
|
173
212
|
if (!refreshToken && (!browserSession || browserSession == "unActive")) {
|
|
174
213
|
await clearAuthToken();
|
|
@@ -193,8 +232,8 @@ var axiosClient = {
|
|
|
193
232
|
}
|
|
194
233
|
).then(async (res) => {
|
|
195
234
|
const data = res.data;
|
|
196
|
-
await
|
|
197
|
-
await
|
|
235
|
+
await localStorage2.setToken(data.access_token);
|
|
236
|
+
await localStorage2.setRefreshToken(data.refresh_token);
|
|
198
237
|
axios.defaults.headers.common["Authorization"] = "Bearer " + data.access_token;
|
|
199
238
|
originalRequest.headers["Authorization"] = "Bearer " + data.access_token;
|
|
200
239
|
processQueue(null, data.access_token);
|
|
@@ -226,7 +265,7 @@ var axiosClient = {
|
|
|
226
265
|
return res;
|
|
227
266
|
};
|
|
228
267
|
const clearAuthToken = async () => {
|
|
229
|
-
await
|
|
268
|
+
await localStorage2.clearToken();
|
|
230
269
|
if (typeof window !== "undefined") {
|
|
231
270
|
window.location.href = `/login`;
|
|
232
271
|
}
|
|
@@ -253,4 +292,4 @@ var axiosClient = {
|
|
|
253
292
|
}
|
|
254
293
|
};
|
|
255
294
|
|
|
256
|
-
export { axiosClient };
|
|
295
|
+
export { axiosClient, localStorageUtils, sessionStorageUtils };
|
|
@@ -6,6 +6,45 @@ function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
|
|
|
6
6
|
|
|
7
7
|
var axios__default = /*#__PURE__*/_interopDefault(axios);
|
|
8
8
|
|
|
9
|
+
// src/config/axios-client.ts
|
|
10
|
+
|
|
11
|
+
// src/utils/storage/local-storage.ts
|
|
12
|
+
var localStorageUtils = () => {
|
|
13
|
+
const setToken = async (access_token) => {
|
|
14
|
+
localStorage.setItem("accessToken", access_token);
|
|
15
|
+
};
|
|
16
|
+
const setRefreshToken = async (refresh_token) => {
|
|
17
|
+
localStorage.setItem("refreshToken", refresh_token);
|
|
18
|
+
};
|
|
19
|
+
const getAccessToken = async () => {
|
|
20
|
+
return localStorage.getItem("accessToken");
|
|
21
|
+
};
|
|
22
|
+
const getRefreshToken = async () => {
|
|
23
|
+
return localStorage.getItem("refreshToken");
|
|
24
|
+
};
|
|
25
|
+
const clearToken = async () => {
|
|
26
|
+
localStorage.removeItem("accessToken");
|
|
27
|
+
localStorage.removeItem("refreshToken");
|
|
28
|
+
};
|
|
29
|
+
return {
|
|
30
|
+
setToken,
|
|
31
|
+
setRefreshToken,
|
|
32
|
+
getAccessToken,
|
|
33
|
+
getRefreshToken,
|
|
34
|
+
clearToken
|
|
35
|
+
};
|
|
36
|
+
};
|
|
37
|
+
|
|
38
|
+
// src/utils/storage/session-storage.ts
|
|
39
|
+
var sessionStorageUtils = () => {
|
|
40
|
+
const getBrowserSession = async () => {
|
|
41
|
+
return sessionStorage.getItem("browserSession");
|
|
42
|
+
};
|
|
43
|
+
return {
|
|
44
|
+
getBrowserSession
|
|
45
|
+
};
|
|
46
|
+
};
|
|
47
|
+
|
|
9
48
|
// src/config/axios-client.ts
|
|
10
49
|
var MAINT_KEY = "MAINTENANCE_ACTIVE";
|
|
11
50
|
var MAINT_AT = "MAINTENANCE_AT";
|
|
@@ -53,8 +92,8 @@ async function clearMaintenanceAndExit(getToken, opts) {
|
|
|
53
92
|
}
|
|
54
93
|
var axiosClient = {
|
|
55
94
|
init(config) {
|
|
56
|
-
const
|
|
57
|
-
const
|
|
95
|
+
const localStorage2 = config.localStorageUtils ?? localStorageUtils();
|
|
96
|
+
const sessionStorage2 = config.sessionStorageUtils ?? sessionStorageUtils();
|
|
58
97
|
const db = config.db;
|
|
59
98
|
let isRefreshing = false;
|
|
60
99
|
let failedQueue = [];
|
|
@@ -86,10 +125,10 @@ var axiosClient = {
|
|
|
86
125
|
(async () => {
|
|
87
126
|
try {
|
|
88
127
|
await axios__default.default.get(healthUrl, { timeout: 8e3 });
|
|
89
|
-
await clearMaintenanceAndExit(() =>
|
|
128
|
+
await clearMaintenanceAndExit(() => localStorage2.getAccessToken(), {
|
|
90
129
|
forceLogin: true,
|
|
91
130
|
clearTokenOnForce: true,
|
|
92
|
-
clearToken: () =>
|
|
131
|
+
clearToken: () => localStorage2.clearToken()
|
|
93
132
|
});
|
|
94
133
|
} catch {
|
|
95
134
|
}
|
|
@@ -98,7 +137,7 @@ var axiosClient = {
|
|
|
98
137
|
}
|
|
99
138
|
instance.interceptors.request.use(
|
|
100
139
|
async (configReq) => {
|
|
101
|
-
const token = await
|
|
140
|
+
const token = await localStorage2.getAccessToken();
|
|
102
141
|
if (token) {
|
|
103
142
|
configReq.headers["Authorization"] = "Bearer " + token;
|
|
104
143
|
}
|
|
@@ -114,11 +153,11 @@ var axiosClient = {
|
|
|
114
153
|
if (isMaint && onMaintenancePage) {
|
|
115
154
|
(async () => {
|
|
116
155
|
await clearMaintenanceAndExit(
|
|
117
|
-
() =>
|
|
156
|
+
() => localStorage2.getAccessToken(),
|
|
118
157
|
{
|
|
119
158
|
forceLogin: true,
|
|
120
159
|
clearTokenOnForce: true,
|
|
121
|
-
clearToken: () =>
|
|
160
|
+
clearToken: () => localStorage2.clearToken()
|
|
122
161
|
}
|
|
123
162
|
);
|
|
124
163
|
})();
|
|
@@ -172,9 +211,9 @@ var axiosClient = {
|
|
|
172
211
|
}
|
|
173
212
|
});
|
|
174
213
|
}
|
|
175
|
-
const browserSession = await
|
|
176
|
-
const refreshToken = await
|
|
177
|
-
const accessTokenExp = await
|
|
214
|
+
const browserSession = await sessionStorage2.getBrowserSession();
|
|
215
|
+
const refreshToken = await localStorage2.getRefreshToken();
|
|
216
|
+
const accessTokenExp = await localStorage2.getAccessToken();
|
|
178
217
|
isRefreshing = true;
|
|
179
218
|
if (!refreshToken && (!browserSession || browserSession == "unActive")) {
|
|
180
219
|
await clearAuthToken();
|
|
@@ -199,8 +238,8 @@ var axiosClient = {
|
|
|
199
238
|
}
|
|
200
239
|
).then(async (res) => {
|
|
201
240
|
const data = res.data;
|
|
202
|
-
await
|
|
203
|
-
await
|
|
241
|
+
await localStorage2.setToken(data.access_token);
|
|
242
|
+
await localStorage2.setRefreshToken(data.refresh_token);
|
|
204
243
|
axios__default.default.defaults.headers.common["Authorization"] = "Bearer " + data.access_token;
|
|
205
244
|
originalRequest.headers["Authorization"] = "Bearer " + data.access_token;
|
|
206
245
|
processQueue(null, data.access_token);
|
|
@@ -232,7 +271,7 @@ var axiosClient = {
|
|
|
232
271
|
return res;
|
|
233
272
|
};
|
|
234
273
|
const clearAuthToken = async () => {
|
|
235
|
-
await
|
|
274
|
+
await localStorage2.clearToken();
|
|
236
275
|
if (typeof window !== "undefined") {
|
|
237
276
|
window.location.href = `/login`;
|
|
238
277
|
}
|
|
@@ -260,3 +299,5 @@ var axiosClient = {
|
|
|
260
299
|
};
|
|
261
300
|
|
|
262
301
|
exports.axiosClient = axiosClient;
|
|
302
|
+
exports.localStorageUtils = localStorageUtils;
|
|
303
|
+
exports.sessionStorageUtils = sessionStorageUtils;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
var
|
|
3
|
+
var chunkUYN3VSHW_js = require('./chunk-UYN3VSHW.js');
|
|
4
4
|
|
|
5
5
|
// src/models/base-model/index.ts
|
|
6
6
|
var BaseModel = class {
|
|
@@ -57,7 +57,7 @@ var BaseModel = class {
|
|
|
57
57
|
fields: {
|
|
58
58
|
id: {},
|
|
59
59
|
display_name: {},
|
|
60
|
-
...
|
|
60
|
+
...chunkUYN3VSHW_js.WIDGETAVATAR[field?.widget] ? { image_256: {} } : {},
|
|
61
61
|
...field?.name === "currency_id" && fields?.find((item) => item?.widget === "monetary") ? { symbol: {} } : {},
|
|
62
62
|
...field?.widget === "many2many_binary" ? { mimetype: {} } : {}
|
|
63
63
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
var
|
|
3
|
+
var chunkZAYNNN2Q_js = require('./chunk-ZAYNNN2Q.js');
|
|
4
4
|
var chunkRZBHZYXG_js = require('./chunk-RZBHZYXG.js');
|
|
5
5
|
var react = require('react');
|
|
6
6
|
var reactQuery = require('@tanstack/react-query');
|
|
@@ -37,7 +37,7 @@ var VersionGate = ({ children }) => {
|
|
|
37
37
|
localStorage.removeItem("__api_version__");
|
|
38
38
|
};
|
|
39
39
|
const validateVersion = async () => {
|
|
40
|
-
const serverVersion = await
|
|
40
|
+
const serverVersion = await chunkZAYNNN2Q_js.view_service_default.getVersion();
|
|
41
41
|
const cached = localStorage.getItem("__api_version__");
|
|
42
42
|
if (cached !== serverVersion?.api_version) {
|
|
43
43
|
clearVersion();
|