@fctc/interface-logic 3.8.7 → 3.8.9
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 +18 -20
- package/dist/configs.mjs +18 -20
- package/dist/environment.js +18 -20
- package/dist/environment.mjs +18 -20
- package/dist/provider.js +18 -20
- package/dist/provider.mjs +18 -20
- package/package.json +1 -1
package/dist/configs.js
CHANGED
|
@@ -2303,7 +2303,7 @@ var axiosClient = {
|
|
|
2303
2303
|
return handleResponse(response);
|
|
2304
2304
|
},
|
|
2305
2305
|
async (error) => {
|
|
2306
|
-
const
|
|
2306
|
+
const handleError3 = async (error2) => {
|
|
2307
2307
|
if (!error2.response) {
|
|
2308
2308
|
return error2;
|
|
2309
2309
|
}
|
|
@@ -2317,6 +2317,7 @@ var axiosClient = {
|
|
|
2317
2317
|
if ((error.response?.status === 403 || error.response?.status === 401 || error.response?.status === 404) && ["TOKEN_EXPIRED", "AUTHEN_FAIL", 401, "ERR_2FA_006"].includes(
|
|
2318
2318
|
error.response.data.code
|
|
2319
2319
|
)) {
|
|
2320
|
+
console.log("isRefreshing", isRefreshing);
|
|
2320
2321
|
if (isRefreshing) {
|
|
2321
2322
|
return new Promise(function(resolve, reject) {
|
|
2322
2323
|
failedQueue.push({ resolve, reject });
|
|
@@ -2326,7 +2327,6 @@ var axiosClient = {
|
|
|
2326
2327
|
originalRequest,
|
|
2327
2328
|
token
|
|
2328
2329
|
);
|
|
2329
|
-
ensureApiV2(originalRequest);
|
|
2330
2330
|
return instance.request(originalRequest);
|
|
2331
2331
|
}).catch(async (err) => {
|
|
2332
2332
|
if ((err.response?.status === 400 || err.response?.status === 401) && ["invalid_grant"].includes(err.response.data.error)) {
|
|
@@ -2339,6 +2339,7 @@ var axiosClient = {
|
|
|
2339
2339
|
const accessTokenExp = await localStorage2.getAccessToken();
|
|
2340
2340
|
isRefreshing = true;
|
|
2341
2341
|
if (!refreshToken && (!browserSession || browserSession == "unActive")) {
|
|
2342
|
+
console.log("222");
|
|
2342
2343
|
await clearAuthToken();
|
|
2343
2344
|
} else {
|
|
2344
2345
|
const payload = Object.fromEntries(
|
|
@@ -2349,6 +2350,7 @@ var axiosClient = {
|
|
|
2349
2350
|
client_secret: config.config.clientSecret
|
|
2350
2351
|
}).filter(([_, value]) => !!value)
|
|
2351
2352
|
);
|
|
2353
|
+
console.log("111");
|
|
2352
2354
|
return new Promise(function(resolve) {
|
|
2353
2355
|
import_axios.default.post(
|
|
2354
2356
|
`${config?.baseUrl}${config.refreshTokenEndpoint ?? "/authentication/oauth2/token" /* AUTH_TOKEN_PATH */}`,
|
|
@@ -2370,7 +2372,6 @@ var axiosClient = {
|
|
|
2370
2372
|
data.access_token
|
|
2371
2373
|
);
|
|
2372
2374
|
processQueue(null, data.access_token);
|
|
2373
|
-
ensureApiV2(originalRequest);
|
|
2374
2375
|
resolve(instance.request(originalRequest));
|
|
2375
2376
|
}).catch(async (err) => {
|
|
2376
2377
|
console.log("catch error: ", err);
|
|
@@ -2393,7 +2394,7 @@ var axiosClient = {
|
|
|
2393
2394
|
});
|
|
2394
2395
|
}
|
|
2395
2396
|
}
|
|
2396
|
-
return Promise.reject(await
|
|
2397
|
+
return Promise.reject(await handleError3(error));
|
|
2397
2398
|
}
|
|
2398
2399
|
);
|
|
2399
2400
|
const handleResponse = (res) => {
|
|
@@ -2402,6 +2403,19 @@ var axiosClient = {
|
|
|
2402
2403
|
}
|
|
2403
2404
|
return res;
|
|
2404
2405
|
};
|
|
2406
|
+
const handleError2 = (error) => {
|
|
2407
|
+
if (error.isAxiosError && error.code === "ECONNABORTED") {
|
|
2408
|
+
console.error("Request Timeout Error:", error);
|
|
2409
|
+
return "Request Timeout Error";
|
|
2410
|
+
} else if (error.isAxiosError && !error.response) {
|
|
2411
|
+
console.error("Network Error:", error);
|
|
2412
|
+
return "Network Error";
|
|
2413
|
+
} else {
|
|
2414
|
+
console.error("Other Error:", error?.response);
|
|
2415
|
+
const errorMessage = error?.response?.data?.message || "An error occurred";
|
|
2416
|
+
return { message: errorMessage, status: error?.response?.status };
|
|
2417
|
+
}
|
|
2418
|
+
};
|
|
2405
2419
|
const clearAuthToken = async () => {
|
|
2406
2420
|
await localStorage2.clearToken();
|
|
2407
2421
|
if (typeof window !== "undefined") {
|
|
@@ -2414,22 +2428,6 @@ var axiosClient = {
|
|
|
2414
2428
|
const getBaseUrl = (baseUrl, hardService) => {
|
|
2415
2429
|
return `${baseUrl.replace(/\/$/, "")}/${hardService || sessionStorage2.getMenuFocus().service || config?.default_service}/api/v2`;
|
|
2416
2430
|
};
|
|
2417
|
-
const ensureApiV2 = (req) => {
|
|
2418
|
-
try {
|
|
2419
|
-
const baseUrl = (config?.baseUrl || "").replace(/\/$/, "");
|
|
2420
|
-
const u = String(req?.url || "");
|
|
2421
|
-
if (/\/api\/v2(\/|$)/.test(u)) return req;
|
|
2422
|
-
const baseUrlEscaped = baseUrl.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&");
|
|
2423
|
-
const stripped = u.replace(new RegExp(`^${baseUrlEscaped}`), "");
|
|
2424
|
-
const hardService = req?.headers?.["X-Hard-Service"] || req?.headers?.["x-hard-service"];
|
|
2425
|
-
const prefix = getBaseUrl(baseUrl, hardService).replace(/\/$/, "");
|
|
2426
|
-
const path = (stripped || u || "").replace(/^\/+/, "");
|
|
2427
|
-
req.url = `${prefix}/${path}`;
|
|
2428
|
-
req.baseURL = void 0;
|
|
2429
|
-
} catch (_e) {
|
|
2430
|
-
}
|
|
2431
|
-
return req;
|
|
2432
|
-
};
|
|
2433
2431
|
const getHeaders = (header) => {
|
|
2434
2432
|
const headers = {
|
|
2435
2433
|
headers: {
|
package/dist/configs.mjs
CHANGED
|
@@ -2267,7 +2267,7 @@ var axiosClient = {
|
|
|
2267
2267
|
return handleResponse(response);
|
|
2268
2268
|
},
|
|
2269
2269
|
async (error) => {
|
|
2270
|
-
const
|
|
2270
|
+
const handleError3 = async (error2) => {
|
|
2271
2271
|
if (!error2.response) {
|
|
2272
2272
|
return error2;
|
|
2273
2273
|
}
|
|
@@ -2281,6 +2281,7 @@ var axiosClient = {
|
|
|
2281
2281
|
if ((error.response?.status === 403 || error.response?.status === 401 || error.response?.status === 404) && ["TOKEN_EXPIRED", "AUTHEN_FAIL", 401, "ERR_2FA_006"].includes(
|
|
2282
2282
|
error.response.data.code
|
|
2283
2283
|
)) {
|
|
2284
|
+
console.log("isRefreshing", isRefreshing);
|
|
2284
2285
|
if (isRefreshing) {
|
|
2285
2286
|
return new Promise(function(resolve, reject) {
|
|
2286
2287
|
failedQueue.push({ resolve, reject });
|
|
@@ -2290,7 +2291,6 @@ var axiosClient = {
|
|
|
2290
2291
|
originalRequest,
|
|
2291
2292
|
token
|
|
2292
2293
|
);
|
|
2293
|
-
ensureApiV2(originalRequest);
|
|
2294
2294
|
return instance.request(originalRequest);
|
|
2295
2295
|
}).catch(async (err) => {
|
|
2296
2296
|
if ((err.response?.status === 400 || err.response?.status === 401) && ["invalid_grant"].includes(err.response.data.error)) {
|
|
@@ -2303,6 +2303,7 @@ var axiosClient = {
|
|
|
2303
2303
|
const accessTokenExp = await localStorage2.getAccessToken();
|
|
2304
2304
|
isRefreshing = true;
|
|
2305
2305
|
if (!refreshToken && (!browserSession || browserSession == "unActive")) {
|
|
2306
|
+
console.log("222");
|
|
2306
2307
|
await clearAuthToken();
|
|
2307
2308
|
} else {
|
|
2308
2309
|
const payload = Object.fromEntries(
|
|
@@ -2313,6 +2314,7 @@ var axiosClient = {
|
|
|
2313
2314
|
client_secret: config.config.clientSecret
|
|
2314
2315
|
}).filter(([_, value]) => !!value)
|
|
2315
2316
|
);
|
|
2317
|
+
console.log("111");
|
|
2316
2318
|
return new Promise(function(resolve) {
|
|
2317
2319
|
axios.post(
|
|
2318
2320
|
`${config?.baseUrl}${config.refreshTokenEndpoint ?? "/authentication/oauth2/token" /* AUTH_TOKEN_PATH */}`,
|
|
@@ -2334,7 +2336,6 @@ var axiosClient = {
|
|
|
2334
2336
|
data.access_token
|
|
2335
2337
|
);
|
|
2336
2338
|
processQueue(null, data.access_token);
|
|
2337
|
-
ensureApiV2(originalRequest);
|
|
2338
2339
|
resolve(instance.request(originalRequest));
|
|
2339
2340
|
}).catch(async (err) => {
|
|
2340
2341
|
console.log("catch error: ", err);
|
|
@@ -2357,7 +2358,7 @@ var axiosClient = {
|
|
|
2357
2358
|
});
|
|
2358
2359
|
}
|
|
2359
2360
|
}
|
|
2360
|
-
return Promise.reject(await
|
|
2361
|
+
return Promise.reject(await handleError3(error));
|
|
2361
2362
|
}
|
|
2362
2363
|
);
|
|
2363
2364
|
const handleResponse = (res) => {
|
|
@@ -2366,6 +2367,19 @@ var axiosClient = {
|
|
|
2366
2367
|
}
|
|
2367
2368
|
return res;
|
|
2368
2369
|
};
|
|
2370
|
+
const handleError2 = (error) => {
|
|
2371
|
+
if (error.isAxiosError && error.code === "ECONNABORTED") {
|
|
2372
|
+
console.error("Request Timeout Error:", error);
|
|
2373
|
+
return "Request Timeout Error";
|
|
2374
|
+
} else if (error.isAxiosError && !error.response) {
|
|
2375
|
+
console.error("Network Error:", error);
|
|
2376
|
+
return "Network Error";
|
|
2377
|
+
} else {
|
|
2378
|
+
console.error("Other Error:", error?.response);
|
|
2379
|
+
const errorMessage = error?.response?.data?.message || "An error occurred";
|
|
2380
|
+
return { message: errorMessage, status: error?.response?.status };
|
|
2381
|
+
}
|
|
2382
|
+
};
|
|
2369
2383
|
const clearAuthToken = async () => {
|
|
2370
2384
|
await localStorage2.clearToken();
|
|
2371
2385
|
if (typeof window !== "undefined") {
|
|
@@ -2378,22 +2392,6 @@ var axiosClient = {
|
|
|
2378
2392
|
const getBaseUrl = (baseUrl, hardService) => {
|
|
2379
2393
|
return `${baseUrl.replace(/\/$/, "")}/${hardService || sessionStorage2.getMenuFocus().service || config?.default_service}/api/v2`;
|
|
2380
2394
|
};
|
|
2381
|
-
const ensureApiV2 = (req) => {
|
|
2382
|
-
try {
|
|
2383
|
-
const baseUrl = (config?.baseUrl || "").replace(/\/$/, "");
|
|
2384
|
-
const u = String(req?.url || "");
|
|
2385
|
-
if (/\/api\/v2(\/|$)/.test(u)) return req;
|
|
2386
|
-
const baseUrlEscaped = baseUrl.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&");
|
|
2387
|
-
const stripped = u.replace(new RegExp(`^${baseUrlEscaped}`), "");
|
|
2388
|
-
const hardService = req?.headers?.["X-Hard-Service"] || req?.headers?.["x-hard-service"];
|
|
2389
|
-
const prefix = getBaseUrl(baseUrl, hardService).replace(/\/$/, "");
|
|
2390
|
-
const path = (stripped || u || "").replace(/^\/+/, "");
|
|
2391
|
-
req.url = `${prefix}/${path}`;
|
|
2392
|
-
req.baseURL = void 0;
|
|
2393
|
-
} catch (_e) {
|
|
2394
|
-
}
|
|
2395
|
-
return req;
|
|
2396
|
-
};
|
|
2397
2395
|
const getHeaders = (header) => {
|
|
2398
2396
|
const headers = {
|
|
2399
2397
|
headers: {
|
package/dist/environment.js
CHANGED
|
@@ -2305,7 +2305,7 @@ var axiosClient = {
|
|
|
2305
2305
|
return handleResponse(response);
|
|
2306
2306
|
},
|
|
2307
2307
|
async (error) => {
|
|
2308
|
-
const
|
|
2308
|
+
const handleError3 = async (error2) => {
|
|
2309
2309
|
if (!error2.response) {
|
|
2310
2310
|
return error2;
|
|
2311
2311
|
}
|
|
@@ -2319,6 +2319,7 @@ var axiosClient = {
|
|
|
2319
2319
|
if ((error.response?.status === 403 || error.response?.status === 401 || error.response?.status === 404) && ["TOKEN_EXPIRED", "AUTHEN_FAIL", 401, "ERR_2FA_006"].includes(
|
|
2320
2320
|
error.response.data.code
|
|
2321
2321
|
)) {
|
|
2322
|
+
console.log("isRefreshing", isRefreshing);
|
|
2322
2323
|
if (isRefreshing) {
|
|
2323
2324
|
return new Promise(function(resolve, reject) {
|
|
2324
2325
|
failedQueue.push({ resolve, reject });
|
|
@@ -2328,7 +2329,6 @@ var axiosClient = {
|
|
|
2328
2329
|
originalRequest,
|
|
2329
2330
|
token
|
|
2330
2331
|
);
|
|
2331
|
-
ensureApiV2(originalRequest);
|
|
2332
2332
|
return instance.request(originalRequest);
|
|
2333
2333
|
}).catch(async (err) => {
|
|
2334
2334
|
if ((err.response?.status === 400 || err.response?.status === 401) && ["invalid_grant"].includes(err.response.data.error)) {
|
|
@@ -2341,6 +2341,7 @@ var axiosClient = {
|
|
|
2341
2341
|
const accessTokenExp = await localStorage2.getAccessToken();
|
|
2342
2342
|
isRefreshing = true;
|
|
2343
2343
|
if (!refreshToken && (!browserSession || browserSession == "unActive")) {
|
|
2344
|
+
console.log("222");
|
|
2344
2345
|
await clearAuthToken();
|
|
2345
2346
|
} else {
|
|
2346
2347
|
const payload = Object.fromEntries(
|
|
@@ -2351,6 +2352,7 @@ var axiosClient = {
|
|
|
2351
2352
|
client_secret: config.config.clientSecret
|
|
2352
2353
|
}).filter(([_, value]) => !!value)
|
|
2353
2354
|
);
|
|
2355
|
+
console.log("111");
|
|
2354
2356
|
return new Promise(function(resolve) {
|
|
2355
2357
|
import_axios.default.post(
|
|
2356
2358
|
`${config?.baseUrl}${config.refreshTokenEndpoint ?? "/authentication/oauth2/token" /* AUTH_TOKEN_PATH */}`,
|
|
@@ -2372,7 +2374,6 @@ var axiosClient = {
|
|
|
2372
2374
|
data.access_token
|
|
2373
2375
|
);
|
|
2374
2376
|
processQueue(null, data.access_token);
|
|
2375
|
-
ensureApiV2(originalRequest);
|
|
2376
2377
|
resolve(instance.request(originalRequest));
|
|
2377
2378
|
}).catch(async (err) => {
|
|
2378
2379
|
console.log("catch error: ", err);
|
|
@@ -2395,7 +2396,7 @@ var axiosClient = {
|
|
|
2395
2396
|
});
|
|
2396
2397
|
}
|
|
2397
2398
|
}
|
|
2398
|
-
return Promise.reject(await
|
|
2399
|
+
return Promise.reject(await handleError3(error));
|
|
2399
2400
|
}
|
|
2400
2401
|
);
|
|
2401
2402
|
const handleResponse = (res) => {
|
|
@@ -2404,6 +2405,19 @@ var axiosClient = {
|
|
|
2404
2405
|
}
|
|
2405
2406
|
return res;
|
|
2406
2407
|
};
|
|
2408
|
+
const handleError2 = (error) => {
|
|
2409
|
+
if (error.isAxiosError && error.code === "ECONNABORTED") {
|
|
2410
|
+
console.error("Request Timeout Error:", error);
|
|
2411
|
+
return "Request Timeout Error";
|
|
2412
|
+
} else if (error.isAxiosError && !error.response) {
|
|
2413
|
+
console.error("Network Error:", error);
|
|
2414
|
+
return "Network Error";
|
|
2415
|
+
} else {
|
|
2416
|
+
console.error("Other Error:", error?.response);
|
|
2417
|
+
const errorMessage = error?.response?.data?.message || "An error occurred";
|
|
2418
|
+
return { message: errorMessage, status: error?.response?.status };
|
|
2419
|
+
}
|
|
2420
|
+
};
|
|
2407
2421
|
const clearAuthToken = async () => {
|
|
2408
2422
|
await localStorage2.clearToken();
|
|
2409
2423
|
if (typeof window !== "undefined") {
|
|
@@ -2416,22 +2430,6 @@ var axiosClient = {
|
|
|
2416
2430
|
const getBaseUrl = (baseUrl, hardService) => {
|
|
2417
2431
|
return `${baseUrl.replace(/\/$/, "")}/${hardService || sessionStorage2.getMenuFocus().service || config?.default_service}/api/v2`;
|
|
2418
2432
|
};
|
|
2419
|
-
const ensureApiV2 = (req) => {
|
|
2420
|
-
try {
|
|
2421
|
-
const baseUrl = (config?.baseUrl || "").replace(/\/$/, "");
|
|
2422
|
-
const u = String(req?.url || "");
|
|
2423
|
-
if (/\/api\/v2(\/|$)/.test(u)) return req;
|
|
2424
|
-
const baseUrlEscaped = baseUrl.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&");
|
|
2425
|
-
const stripped = u.replace(new RegExp(`^${baseUrlEscaped}`), "");
|
|
2426
|
-
const hardService = req?.headers?.["X-Hard-Service"] || req?.headers?.["x-hard-service"];
|
|
2427
|
-
const prefix = getBaseUrl(baseUrl, hardService).replace(/\/$/, "");
|
|
2428
|
-
const path = (stripped || u || "").replace(/^\/+/, "");
|
|
2429
|
-
req.url = `${prefix}/${path}`;
|
|
2430
|
-
req.baseURL = void 0;
|
|
2431
|
-
} catch (_e) {
|
|
2432
|
-
}
|
|
2433
|
-
return req;
|
|
2434
|
-
};
|
|
2435
2433
|
const getHeaders = (header) => {
|
|
2436
2434
|
const headers = {
|
|
2437
2435
|
headers: {
|
package/dist/environment.mjs
CHANGED
|
@@ -2267,7 +2267,7 @@ var axiosClient = {
|
|
|
2267
2267
|
return handleResponse(response);
|
|
2268
2268
|
},
|
|
2269
2269
|
async (error) => {
|
|
2270
|
-
const
|
|
2270
|
+
const handleError3 = async (error2) => {
|
|
2271
2271
|
if (!error2.response) {
|
|
2272
2272
|
return error2;
|
|
2273
2273
|
}
|
|
@@ -2281,6 +2281,7 @@ var axiosClient = {
|
|
|
2281
2281
|
if ((error.response?.status === 403 || error.response?.status === 401 || error.response?.status === 404) && ["TOKEN_EXPIRED", "AUTHEN_FAIL", 401, "ERR_2FA_006"].includes(
|
|
2282
2282
|
error.response.data.code
|
|
2283
2283
|
)) {
|
|
2284
|
+
console.log("isRefreshing", isRefreshing);
|
|
2284
2285
|
if (isRefreshing) {
|
|
2285
2286
|
return new Promise(function(resolve, reject) {
|
|
2286
2287
|
failedQueue.push({ resolve, reject });
|
|
@@ -2290,7 +2291,6 @@ var axiosClient = {
|
|
|
2290
2291
|
originalRequest,
|
|
2291
2292
|
token
|
|
2292
2293
|
);
|
|
2293
|
-
ensureApiV2(originalRequest);
|
|
2294
2294
|
return instance.request(originalRequest);
|
|
2295
2295
|
}).catch(async (err) => {
|
|
2296
2296
|
if ((err.response?.status === 400 || err.response?.status === 401) && ["invalid_grant"].includes(err.response.data.error)) {
|
|
@@ -2303,6 +2303,7 @@ var axiosClient = {
|
|
|
2303
2303
|
const accessTokenExp = await localStorage2.getAccessToken();
|
|
2304
2304
|
isRefreshing = true;
|
|
2305
2305
|
if (!refreshToken && (!browserSession || browserSession == "unActive")) {
|
|
2306
|
+
console.log("222");
|
|
2306
2307
|
await clearAuthToken();
|
|
2307
2308
|
} else {
|
|
2308
2309
|
const payload = Object.fromEntries(
|
|
@@ -2313,6 +2314,7 @@ var axiosClient = {
|
|
|
2313
2314
|
client_secret: config.config.clientSecret
|
|
2314
2315
|
}).filter(([_, value]) => !!value)
|
|
2315
2316
|
);
|
|
2317
|
+
console.log("111");
|
|
2316
2318
|
return new Promise(function(resolve) {
|
|
2317
2319
|
axios.post(
|
|
2318
2320
|
`${config?.baseUrl}${config.refreshTokenEndpoint ?? "/authentication/oauth2/token" /* AUTH_TOKEN_PATH */}`,
|
|
@@ -2334,7 +2336,6 @@ var axiosClient = {
|
|
|
2334
2336
|
data.access_token
|
|
2335
2337
|
);
|
|
2336
2338
|
processQueue(null, data.access_token);
|
|
2337
|
-
ensureApiV2(originalRequest);
|
|
2338
2339
|
resolve(instance.request(originalRequest));
|
|
2339
2340
|
}).catch(async (err) => {
|
|
2340
2341
|
console.log("catch error: ", err);
|
|
@@ -2357,7 +2358,7 @@ var axiosClient = {
|
|
|
2357
2358
|
});
|
|
2358
2359
|
}
|
|
2359
2360
|
}
|
|
2360
|
-
return Promise.reject(await
|
|
2361
|
+
return Promise.reject(await handleError3(error));
|
|
2361
2362
|
}
|
|
2362
2363
|
);
|
|
2363
2364
|
const handleResponse = (res) => {
|
|
@@ -2366,6 +2367,19 @@ var axiosClient = {
|
|
|
2366
2367
|
}
|
|
2367
2368
|
return res;
|
|
2368
2369
|
};
|
|
2370
|
+
const handleError2 = (error) => {
|
|
2371
|
+
if (error.isAxiosError && error.code === "ECONNABORTED") {
|
|
2372
|
+
console.error("Request Timeout Error:", error);
|
|
2373
|
+
return "Request Timeout Error";
|
|
2374
|
+
} else if (error.isAxiosError && !error.response) {
|
|
2375
|
+
console.error("Network Error:", error);
|
|
2376
|
+
return "Network Error";
|
|
2377
|
+
} else {
|
|
2378
|
+
console.error("Other Error:", error?.response);
|
|
2379
|
+
const errorMessage = error?.response?.data?.message || "An error occurred";
|
|
2380
|
+
return { message: errorMessage, status: error?.response?.status };
|
|
2381
|
+
}
|
|
2382
|
+
};
|
|
2369
2383
|
const clearAuthToken = async () => {
|
|
2370
2384
|
await localStorage2.clearToken();
|
|
2371
2385
|
if (typeof window !== "undefined") {
|
|
@@ -2378,22 +2392,6 @@ var axiosClient = {
|
|
|
2378
2392
|
const getBaseUrl = (baseUrl, hardService) => {
|
|
2379
2393
|
return `${baseUrl.replace(/\/$/, "")}/${hardService || sessionStorage2.getMenuFocus().service || config?.default_service}/api/v2`;
|
|
2380
2394
|
};
|
|
2381
|
-
const ensureApiV2 = (req) => {
|
|
2382
|
-
try {
|
|
2383
|
-
const baseUrl = (config?.baseUrl || "").replace(/\/$/, "");
|
|
2384
|
-
const u = String(req?.url || "");
|
|
2385
|
-
if (/\/api\/v2(\/|$)/.test(u)) return req;
|
|
2386
|
-
const baseUrlEscaped = baseUrl.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&");
|
|
2387
|
-
const stripped = u.replace(new RegExp(`^${baseUrlEscaped}`), "");
|
|
2388
|
-
const hardService = req?.headers?.["X-Hard-Service"] || req?.headers?.["x-hard-service"];
|
|
2389
|
-
const prefix = getBaseUrl(baseUrl, hardService).replace(/\/$/, "");
|
|
2390
|
-
const path = (stripped || u || "").replace(/^\/+/, "");
|
|
2391
|
-
req.url = `${prefix}/${path}`;
|
|
2392
|
-
req.baseURL = void 0;
|
|
2393
|
-
} catch (_e) {
|
|
2394
|
-
}
|
|
2395
|
-
return req;
|
|
2396
|
-
};
|
|
2397
2395
|
const getHeaders = (header) => {
|
|
2398
2396
|
const headers = {
|
|
2399
2397
|
headers: {
|
package/dist/provider.js
CHANGED
|
@@ -5942,7 +5942,7 @@ var axiosClient = {
|
|
|
5942
5942
|
return handleResponse(response);
|
|
5943
5943
|
},
|
|
5944
5944
|
async (error) => {
|
|
5945
|
-
const
|
|
5945
|
+
const handleError3 = async (error2) => {
|
|
5946
5946
|
if (!error2.response) {
|
|
5947
5947
|
return error2;
|
|
5948
5948
|
}
|
|
@@ -5956,6 +5956,7 @@ var axiosClient = {
|
|
|
5956
5956
|
if ((error.response?.status === 403 || error.response?.status === 401 || error.response?.status === 404) && ["TOKEN_EXPIRED", "AUTHEN_FAIL", 401, "ERR_2FA_006"].includes(
|
|
5957
5957
|
error.response.data.code
|
|
5958
5958
|
)) {
|
|
5959
|
+
console.log("isRefreshing", isRefreshing);
|
|
5959
5960
|
if (isRefreshing) {
|
|
5960
5961
|
return new Promise(function(resolve, reject) {
|
|
5961
5962
|
failedQueue.push({ resolve, reject });
|
|
@@ -5965,7 +5966,6 @@ var axiosClient = {
|
|
|
5965
5966
|
originalRequest,
|
|
5966
5967
|
token
|
|
5967
5968
|
);
|
|
5968
|
-
ensureApiV2(originalRequest);
|
|
5969
5969
|
return instance.request(originalRequest);
|
|
5970
5970
|
}).catch(async (err) => {
|
|
5971
5971
|
if ((err.response?.status === 400 || err.response?.status === 401) && ["invalid_grant"].includes(err.response.data.error)) {
|
|
@@ -5978,6 +5978,7 @@ var axiosClient = {
|
|
|
5978
5978
|
const accessTokenExp = await localStorage2.getAccessToken();
|
|
5979
5979
|
isRefreshing = true;
|
|
5980
5980
|
if (!refreshToken && (!browserSession || browserSession == "unActive")) {
|
|
5981
|
+
console.log("222");
|
|
5981
5982
|
await clearAuthToken();
|
|
5982
5983
|
} else {
|
|
5983
5984
|
const payload = Object.fromEntries(
|
|
@@ -5988,6 +5989,7 @@ var axiosClient = {
|
|
|
5988
5989
|
client_secret: config.config.clientSecret
|
|
5989
5990
|
}).filter(([_, value]) => !!value)
|
|
5990
5991
|
);
|
|
5992
|
+
console.log("111");
|
|
5991
5993
|
return new Promise(function(resolve) {
|
|
5992
5994
|
import_axios.default.post(
|
|
5993
5995
|
`${config?.baseUrl}${config.refreshTokenEndpoint ?? "/authentication/oauth2/token" /* AUTH_TOKEN_PATH */}`,
|
|
@@ -6009,7 +6011,6 @@ var axiosClient = {
|
|
|
6009
6011
|
data.access_token
|
|
6010
6012
|
);
|
|
6011
6013
|
processQueue(null, data.access_token);
|
|
6012
|
-
ensureApiV2(originalRequest);
|
|
6013
6014
|
resolve(instance.request(originalRequest));
|
|
6014
6015
|
}).catch(async (err) => {
|
|
6015
6016
|
console.log("catch error: ", err);
|
|
@@ -6032,7 +6033,7 @@ var axiosClient = {
|
|
|
6032
6033
|
});
|
|
6033
6034
|
}
|
|
6034
6035
|
}
|
|
6035
|
-
return Promise.reject(await
|
|
6036
|
+
return Promise.reject(await handleError3(error));
|
|
6036
6037
|
}
|
|
6037
6038
|
);
|
|
6038
6039
|
const handleResponse = (res) => {
|
|
@@ -6041,6 +6042,19 @@ var axiosClient = {
|
|
|
6041
6042
|
}
|
|
6042
6043
|
return res;
|
|
6043
6044
|
};
|
|
6045
|
+
const handleError2 = (error) => {
|
|
6046
|
+
if (error.isAxiosError && error.code === "ECONNABORTED") {
|
|
6047
|
+
console.error("Request Timeout Error:", error);
|
|
6048
|
+
return "Request Timeout Error";
|
|
6049
|
+
} else if (error.isAxiosError && !error.response) {
|
|
6050
|
+
console.error("Network Error:", error);
|
|
6051
|
+
return "Network Error";
|
|
6052
|
+
} else {
|
|
6053
|
+
console.error("Other Error:", error?.response);
|
|
6054
|
+
const errorMessage = error?.response?.data?.message || "An error occurred";
|
|
6055
|
+
return { message: errorMessage, status: error?.response?.status };
|
|
6056
|
+
}
|
|
6057
|
+
};
|
|
6044
6058
|
const clearAuthToken = async () => {
|
|
6045
6059
|
await localStorage2.clearToken();
|
|
6046
6060
|
if (typeof window !== "undefined") {
|
|
@@ -6053,22 +6067,6 @@ var axiosClient = {
|
|
|
6053
6067
|
const getBaseUrl = (baseUrl, hardService) => {
|
|
6054
6068
|
return `${baseUrl.replace(/\/$/, "")}/${hardService || sessionStorage2.getMenuFocus().service || config?.default_service}/api/v2`;
|
|
6055
6069
|
};
|
|
6056
|
-
const ensureApiV2 = (req) => {
|
|
6057
|
-
try {
|
|
6058
|
-
const baseUrl = (config?.baseUrl || "").replace(/\/$/, "");
|
|
6059
|
-
const u = String(req?.url || "");
|
|
6060
|
-
if (/\/api\/v2(\/|$)/.test(u)) return req;
|
|
6061
|
-
const baseUrlEscaped = baseUrl.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&");
|
|
6062
|
-
const stripped = u.replace(new RegExp(`^${baseUrlEscaped}`), "");
|
|
6063
|
-
const hardService = req?.headers?.["X-Hard-Service"] || req?.headers?.["x-hard-service"];
|
|
6064
|
-
const prefix = getBaseUrl(baseUrl, hardService).replace(/\/$/, "");
|
|
6065
|
-
const path = (stripped || u || "").replace(/^\/+/, "");
|
|
6066
|
-
req.url = `${prefix}/${path}`;
|
|
6067
|
-
req.baseURL = void 0;
|
|
6068
|
-
} catch (_e) {
|
|
6069
|
-
}
|
|
6070
|
-
return req;
|
|
6071
|
-
};
|
|
6072
6070
|
const getHeaders = (header) => {
|
|
6073
6071
|
const headers = {
|
|
6074
6072
|
headers: {
|
package/dist/provider.mjs
CHANGED
|
@@ -5899,7 +5899,7 @@ var axiosClient = {
|
|
|
5899
5899
|
return handleResponse(response);
|
|
5900
5900
|
},
|
|
5901
5901
|
async (error) => {
|
|
5902
|
-
const
|
|
5902
|
+
const handleError3 = async (error2) => {
|
|
5903
5903
|
if (!error2.response) {
|
|
5904
5904
|
return error2;
|
|
5905
5905
|
}
|
|
@@ -5913,6 +5913,7 @@ var axiosClient = {
|
|
|
5913
5913
|
if ((error.response?.status === 403 || error.response?.status === 401 || error.response?.status === 404) && ["TOKEN_EXPIRED", "AUTHEN_FAIL", 401, "ERR_2FA_006"].includes(
|
|
5914
5914
|
error.response.data.code
|
|
5915
5915
|
)) {
|
|
5916
|
+
console.log("isRefreshing", isRefreshing);
|
|
5916
5917
|
if (isRefreshing) {
|
|
5917
5918
|
return new Promise(function(resolve, reject) {
|
|
5918
5919
|
failedQueue.push({ resolve, reject });
|
|
@@ -5922,7 +5923,6 @@ var axiosClient = {
|
|
|
5922
5923
|
originalRequest,
|
|
5923
5924
|
token
|
|
5924
5925
|
);
|
|
5925
|
-
ensureApiV2(originalRequest);
|
|
5926
5926
|
return instance.request(originalRequest);
|
|
5927
5927
|
}).catch(async (err) => {
|
|
5928
5928
|
if ((err.response?.status === 400 || err.response?.status === 401) && ["invalid_grant"].includes(err.response.data.error)) {
|
|
@@ -5935,6 +5935,7 @@ var axiosClient = {
|
|
|
5935
5935
|
const accessTokenExp = await localStorage2.getAccessToken();
|
|
5936
5936
|
isRefreshing = true;
|
|
5937
5937
|
if (!refreshToken && (!browserSession || browserSession == "unActive")) {
|
|
5938
|
+
console.log("222");
|
|
5938
5939
|
await clearAuthToken();
|
|
5939
5940
|
} else {
|
|
5940
5941
|
const payload = Object.fromEntries(
|
|
@@ -5945,6 +5946,7 @@ var axiosClient = {
|
|
|
5945
5946
|
client_secret: config.config.clientSecret
|
|
5946
5947
|
}).filter(([_, value]) => !!value)
|
|
5947
5948
|
);
|
|
5949
|
+
console.log("111");
|
|
5948
5950
|
return new Promise(function(resolve) {
|
|
5949
5951
|
axios.post(
|
|
5950
5952
|
`${config?.baseUrl}${config.refreshTokenEndpoint ?? "/authentication/oauth2/token" /* AUTH_TOKEN_PATH */}`,
|
|
@@ -5966,7 +5968,6 @@ var axiosClient = {
|
|
|
5966
5968
|
data.access_token
|
|
5967
5969
|
);
|
|
5968
5970
|
processQueue(null, data.access_token);
|
|
5969
|
-
ensureApiV2(originalRequest);
|
|
5970
5971
|
resolve(instance.request(originalRequest));
|
|
5971
5972
|
}).catch(async (err) => {
|
|
5972
5973
|
console.log("catch error: ", err);
|
|
@@ -5989,7 +5990,7 @@ var axiosClient = {
|
|
|
5989
5990
|
});
|
|
5990
5991
|
}
|
|
5991
5992
|
}
|
|
5992
|
-
return Promise.reject(await
|
|
5993
|
+
return Promise.reject(await handleError3(error));
|
|
5993
5994
|
}
|
|
5994
5995
|
);
|
|
5995
5996
|
const handleResponse = (res) => {
|
|
@@ -5998,6 +5999,19 @@ var axiosClient = {
|
|
|
5998
5999
|
}
|
|
5999
6000
|
return res;
|
|
6000
6001
|
};
|
|
6002
|
+
const handleError2 = (error) => {
|
|
6003
|
+
if (error.isAxiosError && error.code === "ECONNABORTED") {
|
|
6004
|
+
console.error("Request Timeout Error:", error);
|
|
6005
|
+
return "Request Timeout Error";
|
|
6006
|
+
} else if (error.isAxiosError && !error.response) {
|
|
6007
|
+
console.error("Network Error:", error);
|
|
6008
|
+
return "Network Error";
|
|
6009
|
+
} else {
|
|
6010
|
+
console.error("Other Error:", error?.response);
|
|
6011
|
+
const errorMessage = error?.response?.data?.message || "An error occurred";
|
|
6012
|
+
return { message: errorMessage, status: error?.response?.status };
|
|
6013
|
+
}
|
|
6014
|
+
};
|
|
6001
6015
|
const clearAuthToken = async () => {
|
|
6002
6016
|
await localStorage2.clearToken();
|
|
6003
6017
|
if (typeof window !== "undefined") {
|
|
@@ -6010,22 +6024,6 @@ var axiosClient = {
|
|
|
6010
6024
|
const getBaseUrl = (baseUrl, hardService) => {
|
|
6011
6025
|
return `${baseUrl.replace(/\/$/, "")}/${hardService || sessionStorage2.getMenuFocus().service || config?.default_service}/api/v2`;
|
|
6012
6026
|
};
|
|
6013
|
-
const ensureApiV2 = (req) => {
|
|
6014
|
-
try {
|
|
6015
|
-
const baseUrl = (config?.baseUrl || "").replace(/\/$/, "");
|
|
6016
|
-
const u = String(req?.url || "");
|
|
6017
|
-
if (/\/api\/v2(\/|$)/.test(u)) return req;
|
|
6018
|
-
const baseUrlEscaped = baseUrl.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&");
|
|
6019
|
-
const stripped = u.replace(new RegExp(`^${baseUrlEscaped}`), "");
|
|
6020
|
-
const hardService = req?.headers?.["X-Hard-Service"] || req?.headers?.["x-hard-service"];
|
|
6021
|
-
const prefix = getBaseUrl(baseUrl, hardService).replace(/\/$/, "");
|
|
6022
|
-
const path = (stripped || u || "").replace(/^\/+/, "");
|
|
6023
|
-
req.url = `${prefix}/${path}`;
|
|
6024
|
-
req.baseURL = void 0;
|
|
6025
|
-
} catch (_e) {
|
|
6026
|
-
}
|
|
6027
|
-
return req;
|
|
6028
|
-
};
|
|
6029
6027
|
const getHeaders = (header) => {
|
|
6030
6028
|
const headers = {
|
|
6031
6029
|
headers: {
|