@fctc/interface-logic 3.8.8 → 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 +29 -8
- package/dist/configs.mjs +29 -8
- package/dist/environment.js +29 -8
- package/dist/environment.mjs +29 -8
- package/dist/provider.js +29 -8
- package/dist/provider.mjs +29 -8
- package/package.json +1 -1
package/dist/configs.js
CHANGED
|
@@ -2280,6 +2280,8 @@ var axiosClient = {
|
|
|
2280
2280
|
const useRefreshToken = config2.headers["X-Use-Refresh-Token"] === "true";
|
|
2281
2281
|
const useActionToken = config2.headers["X-Use-Action-Token"] === "true";
|
|
2282
2282
|
const actionToken = config2.headers["X-Action-Token"];
|
|
2283
|
+
console.log("config", config2);
|
|
2284
|
+
console.log("useRefreshToken", useRefreshToken);
|
|
2283
2285
|
let token = null;
|
|
2284
2286
|
if (useActionToken && actionToken) {
|
|
2285
2287
|
token = actionToken;
|
|
@@ -2301,7 +2303,7 @@ var axiosClient = {
|
|
|
2301
2303
|
return handleResponse(response);
|
|
2302
2304
|
},
|
|
2303
2305
|
async (error) => {
|
|
2304
|
-
const
|
|
2306
|
+
const handleError3 = async (error2) => {
|
|
2305
2307
|
if (!error2.response) {
|
|
2306
2308
|
return error2;
|
|
2307
2309
|
}
|
|
@@ -2315,6 +2317,7 @@ var axiosClient = {
|
|
|
2315
2317
|
if ((error.response?.status === 403 || error.response?.status === 401 || error.response?.status === 404) && ["TOKEN_EXPIRED", "AUTHEN_FAIL", 401, "ERR_2FA_006"].includes(
|
|
2316
2318
|
error.response.data.code
|
|
2317
2319
|
)) {
|
|
2320
|
+
console.log("isRefreshing", isRefreshing);
|
|
2318
2321
|
if (isRefreshing) {
|
|
2319
2322
|
return new Promise(function(resolve, reject) {
|
|
2320
2323
|
failedQueue.push({ resolve, reject });
|
|
@@ -2336,6 +2339,7 @@ var axiosClient = {
|
|
|
2336
2339
|
const accessTokenExp = await localStorage2.getAccessToken();
|
|
2337
2340
|
isRefreshing = true;
|
|
2338
2341
|
if (!refreshToken && (!browserSession || browserSession == "unActive")) {
|
|
2342
|
+
console.log("222");
|
|
2339
2343
|
await clearAuthToken();
|
|
2340
2344
|
} else {
|
|
2341
2345
|
const payload = Object.fromEntries(
|
|
@@ -2346,14 +2350,18 @@ var axiosClient = {
|
|
|
2346
2350
|
client_secret: config.config.clientSecret
|
|
2347
2351
|
}).filter(([_, value]) => !!value)
|
|
2348
2352
|
);
|
|
2353
|
+
console.log("111");
|
|
2349
2354
|
return new Promise(function(resolve) {
|
|
2350
|
-
|
|
2351
|
-
|
|
2352
|
-
|
|
2353
|
-
|
|
2354
|
-
|
|
2355
|
+
import_axios.default.post(
|
|
2356
|
+
`${config?.baseUrl}${config.refreshTokenEndpoint ?? "/authentication/oauth2/token" /* AUTH_TOKEN_PATH */}`,
|
|
2357
|
+
payload,
|
|
2358
|
+
{
|
|
2359
|
+
headers: {
|
|
2360
|
+
"Content-Type": config.refreshTokenEndpoint ? "application/x-www-form-urlencoded" : "multipart/form-data",
|
|
2361
|
+
Authorization: `Bearer ${accessTokenExp}`
|
|
2362
|
+
}
|
|
2355
2363
|
}
|
|
2356
|
-
|
|
2364
|
+
).then(async (res) => {
|
|
2357
2365
|
const data = res.data;
|
|
2358
2366
|
await localStorage2.setToken(data.access_token);
|
|
2359
2367
|
await localStorage2.setRefreshToken(data.refresh_token);
|
|
@@ -2386,7 +2394,7 @@ var axiosClient = {
|
|
|
2386
2394
|
});
|
|
2387
2395
|
}
|
|
2388
2396
|
}
|
|
2389
|
-
return Promise.reject(await
|
|
2397
|
+
return Promise.reject(await handleError3(error));
|
|
2390
2398
|
}
|
|
2391
2399
|
);
|
|
2392
2400
|
const handleResponse = (res) => {
|
|
@@ -2395,6 +2403,19 @@ var axiosClient = {
|
|
|
2395
2403
|
}
|
|
2396
2404
|
return res;
|
|
2397
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
|
+
};
|
|
2398
2419
|
const clearAuthToken = async () => {
|
|
2399
2420
|
await localStorage2.clearToken();
|
|
2400
2421
|
if (typeof window !== "undefined") {
|
package/dist/configs.mjs
CHANGED
|
@@ -2244,6 +2244,8 @@ var axiosClient = {
|
|
|
2244
2244
|
const useRefreshToken = config2.headers["X-Use-Refresh-Token"] === "true";
|
|
2245
2245
|
const useActionToken = config2.headers["X-Use-Action-Token"] === "true";
|
|
2246
2246
|
const actionToken = config2.headers["X-Action-Token"];
|
|
2247
|
+
console.log("config", config2);
|
|
2248
|
+
console.log("useRefreshToken", useRefreshToken);
|
|
2247
2249
|
let token = null;
|
|
2248
2250
|
if (useActionToken && actionToken) {
|
|
2249
2251
|
token = actionToken;
|
|
@@ -2265,7 +2267,7 @@ var axiosClient = {
|
|
|
2265
2267
|
return handleResponse(response);
|
|
2266
2268
|
},
|
|
2267
2269
|
async (error) => {
|
|
2268
|
-
const
|
|
2270
|
+
const handleError3 = async (error2) => {
|
|
2269
2271
|
if (!error2.response) {
|
|
2270
2272
|
return error2;
|
|
2271
2273
|
}
|
|
@@ -2279,6 +2281,7 @@ var axiosClient = {
|
|
|
2279
2281
|
if ((error.response?.status === 403 || error.response?.status === 401 || error.response?.status === 404) && ["TOKEN_EXPIRED", "AUTHEN_FAIL", 401, "ERR_2FA_006"].includes(
|
|
2280
2282
|
error.response.data.code
|
|
2281
2283
|
)) {
|
|
2284
|
+
console.log("isRefreshing", isRefreshing);
|
|
2282
2285
|
if (isRefreshing) {
|
|
2283
2286
|
return new Promise(function(resolve, reject) {
|
|
2284
2287
|
failedQueue.push({ resolve, reject });
|
|
@@ -2300,6 +2303,7 @@ var axiosClient = {
|
|
|
2300
2303
|
const accessTokenExp = await localStorage2.getAccessToken();
|
|
2301
2304
|
isRefreshing = true;
|
|
2302
2305
|
if (!refreshToken && (!browserSession || browserSession == "unActive")) {
|
|
2306
|
+
console.log("222");
|
|
2303
2307
|
await clearAuthToken();
|
|
2304
2308
|
} else {
|
|
2305
2309
|
const payload = Object.fromEntries(
|
|
@@ -2310,14 +2314,18 @@ var axiosClient = {
|
|
|
2310
2314
|
client_secret: config.config.clientSecret
|
|
2311
2315
|
}).filter(([_, value]) => !!value)
|
|
2312
2316
|
);
|
|
2317
|
+
console.log("111");
|
|
2313
2318
|
return new Promise(function(resolve) {
|
|
2314
|
-
|
|
2315
|
-
|
|
2316
|
-
|
|
2317
|
-
|
|
2318
|
-
|
|
2319
|
+
axios.post(
|
|
2320
|
+
`${config?.baseUrl}${config.refreshTokenEndpoint ?? "/authentication/oauth2/token" /* AUTH_TOKEN_PATH */}`,
|
|
2321
|
+
payload,
|
|
2322
|
+
{
|
|
2323
|
+
headers: {
|
|
2324
|
+
"Content-Type": config.refreshTokenEndpoint ? "application/x-www-form-urlencoded" : "multipart/form-data",
|
|
2325
|
+
Authorization: `Bearer ${accessTokenExp}`
|
|
2326
|
+
}
|
|
2319
2327
|
}
|
|
2320
|
-
|
|
2328
|
+
).then(async (res) => {
|
|
2321
2329
|
const data = res.data;
|
|
2322
2330
|
await localStorage2.setToken(data.access_token);
|
|
2323
2331
|
await localStorage2.setRefreshToken(data.refresh_token);
|
|
@@ -2350,7 +2358,7 @@ var axiosClient = {
|
|
|
2350
2358
|
});
|
|
2351
2359
|
}
|
|
2352
2360
|
}
|
|
2353
|
-
return Promise.reject(await
|
|
2361
|
+
return Promise.reject(await handleError3(error));
|
|
2354
2362
|
}
|
|
2355
2363
|
);
|
|
2356
2364
|
const handleResponse = (res) => {
|
|
@@ -2359,6 +2367,19 @@ var axiosClient = {
|
|
|
2359
2367
|
}
|
|
2360
2368
|
return res;
|
|
2361
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
|
+
};
|
|
2362
2383
|
const clearAuthToken = async () => {
|
|
2363
2384
|
await localStorage2.clearToken();
|
|
2364
2385
|
if (typeof window !== "undefined") {
|
package/dist/environment.js
CHANGED
|
@@ -2282,6 +2282,8 @@ var axiosClient = {
|
|
|
2282
2282
|
const useRefreshToken = config2.headers["X-Use-Refresh-Token"] === "true";
|
|
2283
2283
|
const useActionToken = config2.headers["X-Use-Action-Token"] === "true";
|
|
2284
2284
|
const actionToken = config2.headers["X-Action-Token"];
|
|
2285
|
+
console.log("config", config2);
|
|
2286
|
+
console.log("useRefreshToken", useRefreshToken);
|
|
2285
2287
|
let token = null;
|
|
2286
2288
|
if (useActionToken && actionToken) {
|
|
2287
2289
|
token = actionToken;
|
|
@@ -2303,7 +2305,7 @@ var axiosClient = {
|
|
|
2303
2305
|
return handleResponse(response);
|
|
2304
2306
|
},
|
|
2305
2307
|
async (error) => {
|
|
2306
|
-
const
|
|
2308
|
+
const handleError3 = async (error2) => {
|
|
2307
2309
|
if (!error2.response) {
|
|
2308
2310
|
return error2;
|
|
2309
2311
|
}
|
|
@@ -2317,6 +2319,7 @@ var axiosClient = {
|
|
|
2317
2319
|
if ((error.response?.status === 403 || error.response?.status === 401 || error.response?.status === 404) && ["TOKEN_EXPIRED", "AUTHEN_FAIL", 401, "ERR_2FA_006"].includes(
|
|
2318
2320
|
error.response.data.code
|
|
2319
2321
|
)) {
|
|
2322
|
+
console.log("isRefreshing", isRefreshing);
|
|
2320
2323
|
if (isRefreshing) {
|
|
2321
2324
|
return new Promise(function(resolve, reject) {
|
|
2322
2325
|
failedQueue.push({ resolve, reject });
|
|
@@ -2338,6 +2341,7 @@ var axiosClient = {
|
|
|
2338
2341
|
const accessTokenExp = await localStorage2.getAccessToken();
|
|
2339
2342
|
isRefreshing = true;
|
|
2340
2343
|
if (!refreshToken && (!browserSession || browserSession == "unActive")) {
|
|
2344
|
+
console.log("222");
|
|
2341
2345
|
await clearAuthToken();
|
|
2342
2346
|
} else {
|
|
2343
2347
|
const payload = Object.fromEntries(
|
|
@@ -2348,14 +2352,18 @@ var axiosClient = {
|
|
|
2348
2352
|
client_secret: config.config.clientSecret
|
|
2349
2353
|
}).filter(([_, value]) => !!value)
|
|
2350
2354
|
);
|
|
2355
|
+
console.log("111");
|
|
2351
2356
|
return new Promise(function(resolve) {
|
|
2352
|
-
|
|
2353
|
-
|
|
2354
|
-
|
|
2355
|
-
|
|
2356
|
-
|
|
2357
|
+
import_axios.default.post(
|
|
2358
|
+
`${config?.baseUrl}${config.refreshTokenEndpoint ?? "/authentication/oauth2/token" /* AUTH_TOKEN_PATH */}`,
|
|
2359
|
+
payload,
|
|
2360
|
+
{
|
|
2361
|
+
headers: {
|
|
2362
|
+
"Content-Type": config.refreshTokenEndpoint ? "application/x-www-form-urlencoded" : "multipart/form-data",
|
|
2363
|
+
Authorization: `Bearer ${accessTokenExp}`
|
|
2364
|
+
}
|
|
2357
2365
|
}
|
|
2358
|
-
|
|
2366
|
+
).then(async (res) => {
|
|
2359
2367
|
const data = res.data;
|
|
2360
2368
|
await localStorage2.setToken(data.access_token);
|
|
2361
2369
|
await localStorage2.setRefreshToken(data.refresh_token);
|
|
@@ -2388,7 +2396,7 @@ var axiosClient = {
|
|
|
2388
2396
|
});
|
|
2389
2397
|
}
|
|
2390
2398
|
}
|
|
2391
|
-
return Promise.reject(await
|
|
2399
|
+
return Promise.reject(await handleError3(error));
|
|
2392
2400
|
}
|
|
2393
2401
|
);
|
|
2394
2402
|
const handleResponse = (res) => {
|
|
@@ -2397,6 +2405,19 @@ var axiosClient = {
|
|
|
2397
2405
|
}
|
|
2398
2406
|
return res;
|
|
2399
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
|
+
};
|
|
2400
2421
|
const clearAuthToken = async () => {
|
|
2401
2422
|
await localStorage2.clearToken();
|
|
2402
2423
|
if (typeof window !== "undefined") {
|
package/dist/environment.mjs
CHANGED
|
@@ -2244,6 +2244,8 @@ var axiosClient = {
|
|
|
2244
2244
|
const useRefreshToken = config2.headers["X-Use-Refresh-Token"] === "true";
|
|
2245
2245
|
const useActionToken = config2.headers["X-Use-Action-Token"] === "true";
|
|
2246
2246
|
const actionToken = config2.headers["X-Action-Token"];
|
|
2247
|
+
console.log("config", config2);
|
|
2248
|
+
console.log("useRefreshToken", useRefreshToken);
|
|
2247
2249
|
let token = null;
|
|
2248
2250
|
if (useActionToken && actionToken) {
|
|
2249
2251
|
token = actionToken;
|
|
@@ -2265,7 +2267,7 @@ var axiosClient = {
|
|
|
2265
2267
|
return handleResponse(response);
|
|
2266
2268
|
},
|
|
2267
2269
|
async (error) => {
|
|
2268
|
-
const
|
|
2270
|
+
const handleError3 = async (error2) => {
|
|
2269
2271
|
if (!error2.response) {
|
|
2270
2272
|
return error2;
|
|
2271
2273
|
}
|
|
@@ -2279,6 +2281,7 @@ var axiosClient = {
|
|
|
2279
2281
|
if ((error.response?.status === 403 || error.response?.status === 401 || error.response?.status === 404) && ["TOKEN_EXPIRED", "AUTHEN_FAIL", 401, "ERR_2FA_006"].includes(
|
|
2280
2282
|
error.response.data.code
|
|
2281
2283
|
)) {
|
|
2284
|
+
console.log("isRefreshing", isRefreshing);
|
|
2282
2285
|
if (isRefreshing) {
|
|
2283
2286
|
return new Promise(function(resolve, reject) {
|
|
2284
2287
|
failedQueue.push({ resolve, reject });
|
|
@@ -2300,6 +2303,7 @@ var axiosClient = {
|
|
|
2300
2303
|
const accessTokenExp = await localStorage2.getAccessToken();
|
|
2301
2304
|
isRefreshing = true;
|
|
2302
2305
|
if (!refreshToken && (!browserSession || browserSession == "unActive")) {
|
|
2306
|
+
console.log("222");
|
|
2303
2307
|
await clearAuthToken();
|
|
2304
2308
|
} else {
|
|
2305
2309
|
const payload = Object.fromEntries(
|
|
@@ -2310,14 +2314,18 @@ var axiosClient = {
|
|
|
2310
2314
|
client_secret: config.config.clientSecret
|
|
2311
2315
|
}).filter(([_, value]) => !!value)
|
|
2312
2316
|
);
|
|
2317
|
+
console.log("111");
|
|
2313
2318
|
return new Promise(function(resolve) {
|
|
2314
|
-
|
|
2315
|
-
|
|
2316
|
-
|
|
2317
|
-
|
|
2318
|
-
|
|
2319
|
+
axios.post(
|
|
2320
|
+
`${config?.baseUrl}${config.refreshTokenEndpoint ?? "/authentication/oauth2/token" /* AUTH_TOKEN_PATH */}`,
|
|
2321
|
+
payload,
|
|
2322
|
+
{
|
|
2323
|
+
headers: {
|
|
2324
|
+
"Content-Type": config.refreshTokenEndpoint ? "application/x-www-form-urlencoded" : "multipart/form-data",
|
|
2325
|
+
Authorization: `Bearer ${accessTokenExp}`
|
|
2326
|
+
}
|
|
2319
2327
|
}
|
|
2320
|
-
|
|
2328
|
+
).then(async (res) => {
|
|
2321
2329
|
const data = res.data;
|
|
2322
2330
|
await localStorage2.setToken(data.access_token);
|
|
2323
2331
|
await localStorage2.setRefreshToken(data.refresh_token);
|
|
@@ -2350,7 +2358,7 @@ var axiosClient = {
|
|
|
2350
2358
|
});
|
|
2351
2359
|
}
|
|
2352
2360
|
}
|
|
2353
|
-
return Promise.reject(await
|
|
2361
|
+
return Promise.reject(await handleError3(error));
|
|
2354
2362
|
}
|
|
2355
2363
|
);
|
|
2356
2364
|
const handleResponse = (res) => {
|
|
@@ -2359,6 +2367,19 @@ var axiosClient = {
|
|
|
2359
2367
|
}
|
|
2360
2368
|
return res;
|
|
2361
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
|
+
};
|
|
2362
2383
|
const clearAuthToken = async () => {
|
|
2363
2384
|
await localStorage2.clearToken();
|
|
2364
2385
|
if (typeof window !== "undefined") {
|
package/dist/provider.js
CHANGED
|
@@ -5919,6 +5919,8 @@ var axiosClient = {
|
|
|
5919
5919
|
const useRefreshToken = config2.headers["X-Use-Refresh-Token"] === "true";
|
|
5920
5920
|
const useActionToken = config2.headers["X-Use-Action-Token"] === "true";
|
|
5921
5921
|
const actionToken = config2.headers["X-Action-Token"];
|
|
5922
|
+
console.log("config", config2);
|
|
5923
|
+
console.log("useRefreshToken", useRefreshToken);
|
|
5922
5924
|
let token = null;
|
|
5923
5925
|
if (useActionToken && actionToken) {
|
|
5924
5926
|
token = actionToken;
|
|
@@ -5940,7 +5942,7 @@ var axiosClient = {
|
|
|
5940
5942
|
return handleResponse(response);
|
|
5941
5943
|
},
|
|
5942
5944
|
async (error) => {
|
|
5943
|
-
const
|
|
5945
|
+
const handleError3 = async (error2) => {
|
|
5944
5946
|
if (!error2.response) {
|
|
5945
5947
|
return error2;
|
|
5946
5948
|
}
|
|
@@ -5954,6 +5956,7 @@ var axiosClient = {
|
|
|
5954
5956
|
if ((error.response?.status === 403 || error.response?.status === 401 || error.response?.status === 404) && ["TOKEN_EXPIRED", "AUTHEN_FAIL", 401, "ERR_2FA_006"].includes(
|
|
5955
5957
|
error.response.data.code
|
|
5956
5958
|
)) {
|
|
5959
|
+
console.log("isRefreshing", isRefreshing);
|
|
5957
5960
|
if (isRefreshing) {
|
|
5958
5961
|
return new Promise(function(resolve, reject) {
|
|
5959
5962
|
failedQueue.push({ resolve, reject });
|
|
@@ -5975,6 +5978,7 @@ var axiosClient = {
|
|
|
5975
5978
|
const accessTokenExp = await localStorage2.getAccessToken();
|
|
5976
5979
|
isRefreshing = true;
|
|
5977
5980
|
if (!refreshToken && (!browserSession || browserSession == "unActive")) {
|
|
5981
|
+
console.log("222");
|
|
5978
5982
|
await clearAuthToken();
|
|
5979
5983
|
} else {
|
|
5980
5984
|
const payload = Object.fromEntries(
|
|
@@ -5985,14 +5989,18 @@ var axiosClient = {
|
|
|
5985
5989
|
client_secret: config.config.clientSecret
|
|
5986
5990
|
}).filter(([_, value]) => !!value)
|
|
5987
5991
|
);
|
|
5992
|
+
console.log("111");
|
|
5988
5993
|
return new Promise(function(resolve) {
|
|
5989
|
-
|
|
5990
|
-
|
|
5991
|
-
|
|
5992
|
-
|
|
5993
|
-
|
|
5994
|
+
import_axios.default.post(
|
|
5995
|
+
`${config?.baseUrl}${config.refreshTokenEndpoint ?? "/authentication/oauth2/token" /* AUTH_TOKEN_PATH */}`,
|
|
5996
|
+
payload,
|
|
5997
|
+
{
|
|
5998
|
+
headers: {
|
|
5999
|
+
"Content-Type": config.refreshTokenEndpoint ? "application/x-www-form-urlencoded" : "multipart/form-data",
|
|
6000
|
+
Authorization: `Bearer ${accessTokenExp}`
|
|
6001
|
+
}
|
|
5994
6002
|
}
|
|
5995
|
-
|
|
6003
|
+
).then(async (res) => {
|
|
5996
6004
|
const data = res.data;
|
|
5997
6005
|
await localStorage2.setToken(data.access_token);
|
|
5998
6006
|
await localStorage2.setRefreshToken(data.refresh_token);
|
|
@@ -6025,7 +6033,7 @@ var axiosClient = {
|
|
|
6025
6033
|
});
|
|
6026
6034
|
}
|
|
6027
6035
|
}
|
|
6028
|
-
return Promise.reject(await
|
|
6036
|
+
return Promise.reject(await handleError3(error));
|
|
6029
6037
|
}
|
|
6030
6038
|
);
|
|
6031
6039
|
const handleResponse = (res) => {
|
|
@@ -6034,6 +6042,19 @@ var axiosClient = {
|
|
|
6034
6042
|
}
|
|
6035
6043
|
return res;
|
|
6036
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
|
+
};
|
|
6037
6058
|
const clearAuthToken = async () => {
|
|
6038
6059
|
await localStorage2.clearToken();
|
|
6039
6060
|
if (typeof window !== "undefined") {
|
package/dist/provider.mjs
CHANGED
|
@@ -5876,6 +5876,8 @@ var axiosClient = {
|
|
|
5876
5876
|
const useRefreshToken = config2.headers["X-Use-Refresh-Token"] === "true";
|
|
5877
5877
|
const useActionToken = config2.headers["X-Use-Action-Token"] === "true";
|
|
5878
5878
|
const actionToken = config2.headers["X-Action-Token"];
|
|
5879
|
+
console.log("config", config2);
|
|
5880
|
+
console.log("useRefreshToken", useRefreshToken);
|
|
5879
5881
|
let token = null;
|
|
5880
5882
|
if (useActionToken && actionToken) {
|
|
5881
5883
|
token = actionToken;
|
|
@@ -5897,7 +5899,7 @@ var axiosClient = {
|
|
|
5897
5899
|
return handleResponse(response);
|
|
5898
5900
|
},
|
|
5899
5901
|
async (error) => {
|
|
5900
|
-
const
|
|
5902
|
+
const handleError3 = async (error2) => {
|
|
5901
5903
|
if (!error2.response) {
|
|
5902
5904
|
return error2;
|
|
5903
5905
|
}
|
|
@@ -5911,6 +5913,7 @@ var axiosClient = {
|
|
|
5911
5913
|
if ((error.response?.status === 403 || error.response?.status === 401 || error.response?.status === 404) && ["TOKEN_EXPIRED", "AUTHEN_FAIL", 401, "ERR_2FA_006"].includes(
|
|
5912
5914
|
error.response.data.code
|
|
5913
5915
|
)) {
|
|
5916
|
+
console.log("isRefreshing", isRefreshing);
|
|
5914
5917
|
if (isRefreshing) {
|
|
5915
5918
|
return new Promise(function(resolve, reject) {
|
|
5916
5919
|
failedQueue.push({ resolve, reject });
|
|
@@ -5932,6 +5935,7 @@ var axiosClient = {
|
|
|
5932
5935
|
const accessTokenExp = await localStorage2.getAccessToken();
|
|
5933
5936
|
isRefreshing = true;
|
|
5934
5937
|
if (!refreshToken && (!browserSession || browserSession == "unActive")) {
|
|
5938
|
+
console.log("222");
|
|
5935
5939
|
await clearAuthToken();
|
|
5936
5940
|
} else {
|
|
5937
5941
|
const payload = Object.fromEntries(
|
|
@@ -5942,14 +5946,18 @@ var axiosClient = {
|
|
|
5942
5946
|
client_secret: config.config.clientSecret
|
|
5943
5947
|
}).filter(([_, value]) => !!value)
|
|
5944
5948
|
);
|
|
5949
|
+
console.log("111");
|
|
5945
5950
|
return new Promise(function(resolve) {
|
|
5946
|
-
|
|
5947
|
-
|
|
5948
|
-
|
|
5949
|
-
|
|
5950
|
-
|
|
5951
|
+
axios.post(
|
|
5952
|
+
`${config?.baseUrl}${config.refreshTokenEndpoint ?? "/authentication/oauth2/token" /* AUTH_TOKEN_PATH */}`,
|
|
5953
|
+
payload,
|
|
5954
|
+
{
|
|
5955
|
+
headers: {
|
|
5956
|
+
"Content-Type": config.refreshTokenEndpoint ? "application/x-www-form-urlencoded" : "multipart/form-data",
|
|
5957
|
+
Authorization: `Bearer ${accessTokenExp}`
|
|
5958
|
+
}
|
|
5951
5959
|
}
|
|
5952
|
-
|
|
5960
|
+
).then(async (res) => {
|
|
5953
5961
|
const data = res.data;
|
|
5954
5962
|
await localStorage2.setToken(data.access_token);
|
|
5955
5963
|
await localStorage2.setRefreshToken(data.refresh_token);
|
|
@@ -5982,7 +5990,7 @@ var axiosClient = {
|
|
|
5982
5990
|
});
|
|
5983
5991
|
}
|
|
5984
5992
|
}
|
|
5985
|
-
return Promise.reject(await
|
|
5993
|
+
return Promise.reject(await handleError3(error));
|
|
5986
5994
|
}
|
|
5987
5995
|
);
|
|
5988
5996
|
const handleResponse = (res) => {
|
|
@@ -5991,6 +5999,19 @@ var axiosClient = {
|
|
|
5991
5999
|
}
|
|
5992
6000
|
return res;
|
|
5993
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
|
+
};
|
|
5994
6015
|
const clearAuthToken = async () => {
|
|
5995
6016
|
await localStorage2.clearToken();
|
|
5996
6017
|
if (typeof window !== "undefined") {
|