@fctc/interface-logic 3.8.7 → 3.8.8
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 +6 -29
- package/dist/configs.mjs +6 -29
- package/dist/environment.js +6 -29
- package/dist/environment.mjs +6 -29
- package/dist/provider.js +6 -29
- package/dist/provider.mjs +6 -29
- package/package.json +1 -1
package/dist/configs.js
CHANGED
|
@@ -2280,8 +2280,6 @@ 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);
|
|
2285
2283
|
let token = null;
|
|
2286
2284
|
if (useActionToken && actionToken) {
|
|
2287
2285
|
token = actionToken;
|
|
@@ -2326,7 +2324,6 @@ var axiosClient = {
|
|
|
2326
2324
|
originalRequest,
|
|
2327
2325
|
token
|
|
2328
2326
|
);
|
|
2329
|
-
ensureApiV2(originalRequest);
|
|
2330
2327
|
return instance.request(originalRequest);
|
|
2331
2328
|
}).catch(async (err) => {
|
|
2332
2329
|
if ((err.response?.status === 400 || err.response?.status === 401) && ["invalid_grant"].includes(err.response.data.error)) {
|
|
@@ -2350,16 +2347,13 @@ var axiosClient = {
|
|
|
2350
2347
|
}).filter(([_, value]) => !!value)
|
|
2351
2348
|
);
|
|
2352
2349
|
return new Promise(function(resolve) {
|
|
2353
|
-
|
|
2354
|
-
|
|
2355
|
-
|
|
2356
|
-
|
|
2357
|
-
|
|
2358
|
-
"Content-Type": config.refreshTokenEndpoint ? "application/x-www-form-urlencoded" : "multipart/form-data",
|
|
2359
|
-
Authorization: `Bearer ${accessTokenExp}`
|
|
2360
|
-
}
|
|
2350
|
+
const refreshPath = config.refreshTokenEndpoint ? config.refreshTokenEndpoint : `/api/v2${"/authentication/oauth2/token" /* AUTH_TOKEN_PATH */}`;
|
|
2351
|
+
import_axios.default.post(`${config?.baseUrl}${refreshPath}`, payload, {
|
|
2352
|
+
headers: {
|
|
2353
|
+
"Content-Type": config.refreshTokenEndpoint ? "application/x-www-form-urlencoded" : "multipart/form-data",
|
|
2354
|
+
Authorization: `Bearer ${accessTokenExp}`
|
|
2361
2355
|
}
|
|
2362
|
-
).then(async (res) => {
|
|
2356
|
+
}).then(async (res) => {
|
|
2363
2357
|
const data = res.data;
|
|
2364
2358
|
await localStorage2.setToken(data.access_token);
|
|
2365
2359
|
await localStorage2.setRefreshToken(data.refresh_token);
|
|
@@ -2370,7 +2364,6 @@ var axiosClient = {
|
|
|
2370
2364
|
data.access_token
|
|
2371
2365
|
);
|
|
2372
2366
|
processQueue(null, data.access_token);
|
|
2373
|
-
ensureApiV2(originalRequest);
|
|
2374
2367
|
resolve(instance.request(originalRequest));
|
|
2375
2368
|
}).catch(async (err) => {
|
|
2376
2369
|
console.log("catch error: ", err);
|
|
@@ -2414,22 +2407,6 @@ var axiosClient = {
|
|
|
2414
2407
|
const getBaseUrl = (baseUrl, hardService) => {
|
|
2415
2408
|
return `${baseUrl.replace(/\/$/, "")}/${hardService || sessionStorage2.getMenuFocus().service || config?.default_service}/api/v2`;
|
|
2416
2409
|
};
|
|
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
2410
|
const getHeaders = (header) => {
|
|
2434
2411
|
const headers = {
|
|
2435
2412
|
headers: {
|
package/dist/configs.mjs
CHANGED
|
@@ -2244,8 +2244,6 @@ 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);
|
|
2249
2247
|
let token = null;
|
|
2250
2248
|
if (useActionToken && actionToken) {
|
|
2251
2249
|
token = actionToken;
|
|
@@ -2290,7 +2288,6 @@ var axiosClient = {
|
|
|
2290
2288
|
originalRequest,
|
|
2291
2289
|
token
|
|
2292
2290
|
);
|
|
2293
|
-
ensureApiV2(originalRequest);
|
|
2294
2291
|
return instance.request(originalRequest);
|
|
2295
2292
|
}).catch(async (err) => {
|
|
2296
2293
|
if ((err.response?.status === 400 || err.response?.status === 401) && ["invalid_grant"].includes(err.response.data.error)) {
|
|
@@ -2314,16 +2311,13 @@ var axiosClient = {
|
|
|
2314
2311
|
}).filter(([_, value]) => !!value)
|
|
2315
2312
|
);
|
|
2316
2313
|
return new Promise(function(resolve) {
|
|
2317
|
-
|
|
2318
|
-
|
|
2319
|
-
|
|
2320
|
-
|
|
2321
|
-
|
|
2322
|
-
"Content-Type": config.refreshTokenEndpoint ? "application/x-www-form-urlencoded" : "multipart/form-data",
|
|
2323
|
-
Authorization: `Bearer ${accessTokenExp}`
|
|
2324
|
-
}
|
|
2314
|
+
const refreshPath = config.refreshTokenEndpoint ? config.refreshTokenEndpoint : `/api/v2${"/authentication/oauth2/token" /* AUTH_TOKEN_PATH */}`;
|
|
2315
|
+
axios.post(`${config?.baseUrl}${refreshPath}`, payload, {
|
|
2316
|
+
headers: {
|
|
2317
|
+
"Content-Type": config.refreshTokenEndpoint ? "application/x-www-form-urlencoded" : "multipart/form-data",
|
|
2318
|
+
Authorization: `Bearer ${accessTokenExp}`
|
|
2325
2319
|
}
|
|
2326
|
-
).then(async (res) => {
|
|
2320
|
+
}).then(async (res) => {
|
|
2327
2321
|
const data = res.data;
|
|
2328
2322
|
await localStorage2.setToken(data.access_token);
|
|
2329
2323
|
await localStorage2.setRefreshToken(data.refresh_token);
|
|
@@ -2334,7 +2328,6 @@ var axiosClient = {
|
|
|
2334
2328
|
data.access_token
|
|
2335
2329
|
);
|
|
2336
2330
|
processQueue(null, data.access_token);
|
|
2337
|
-
ensureApiV2(originalRequest);
|
|
2338
2331
|
resolve(instance.request(originalRequest));
|
|
2339
2332
|
}).catch(async (err) => {
|
|
2340
2333
|
console.log("catch error: ", err);
|
|
@@ -2378,22 +2371,6 @@ var axiosClient = {
|
|
|
2378
2371
|
const getBaseUrl = (baseUrl, hardService) => {
|
|
2379
2372
|
return `${baseUrl.replace(/\/$/, "")}/${hardService || sessionStorage2.getMenuFocus().service || config?.default_service}/api/v2`;
|
|
2380
2373
|
};
|
|
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
2374
|
const getHeaders = (header) => {
|
|
2398
2375
|
const headers = {
|
|
2399
2376
|
headers: {
|
package/dist/environment.js
CHANGED
|
@@ -2282,8 +2282,6 @@ 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);
|
|
2287
2285
|
let token = null;
|
|
2288
2286
|
if (useActionToken && actionToken) {
|
|
2289
2287
|
token = actionToken;
|
|
@@ -2328,7 +2326,6 @@ var axiosClient = {
|
|
|
2328
2326
|
originalRequest,
|
|
2329
2327
|
token
|
|
2330
2328
|
);
|
|
2331
|
-
ensureApiV2(originalRequest);
|
|
2332
2329
|
return instance.request(originalRequest);
|
|
2333
2330
|
}).catch(async (err) => {
|
|
2334
2331
|
if ((err.response?.status === 400 || err.response?.status === 401) && ["invalid_grant"].includes(err.response.data.error)) {
|
|
@@ -2352,16 +2349,13 @@ var axiosClient = {
|
|
|
2352
2349
|
}).filter(([_, value]) => !!value)
|
|
2353
2350
|
);
|
|
2354
2351
|
return new Promise(function(resolve) {
|
|
2355
|
-
|
|
2356
|
-
|
|
2357
|
-
|
|
2358
|
-
|
|
2359
|
-
|
|
2360
|
-
"Content-Type": config.refreshTokenEndpoint ? "application/x-www-form-urlencoded" : "multipart/form-data",
|
|
2361
|
-
Authorization: `Bearer ${accessTokenExp}`
|
|
2362
|
-
}
|
|
2352
|
+
const refreshPath = config.refreshTokenEndpoint ? config.refreshTokenEndpoint : `/api/v2${"/authentication/oauth2/token" /* AUTH_TOKEN_PATH */}`;
|
|
2353
|
+
import_axios.default.post(`${config?.baseUrl}${refreshPath}`, payload, {
|
|
2354
|
+
headers: {
|
|
2355
|
+
"Content-Type": config.refreshTokenEndpoint ? "application/x-www-form-urlencoded" : "multipart/form-data",
|
|
2356
|
+
Authorization: `Bearer ${accessTokenExp}`
|
|
2363
2357
|
}
|
|
2364
|
-
).then(async (res) => {
|
|
2358
|
+
}).then(async (res) => {
|
|
2365
2359
|
const data = res.data;
|
|
2366
2360
|
await localStorage2.setToken(data.access_token);
|
|
2367
2361
|
await localStorage2.setRefreshToken(data.refresh_token);
|
|
@@ -2372,7 +2366,6 @@ var axiosClient = {
|
|
|
2372
2366
|
data.access_token
|
|
2373
2367
|
);
|
|
2374
2368
|
processQueue(null, data.access_token);
|
|
2375
|
-
ensureApiV2(originalRequest);
|
|
2376
2369
|
resolve(instance.request(originalRequest));
|
|
2377
2370
|
}).catch(async (err) => {
|
|
2378
2371
|
console.log("catch error: ", err);
|
|
@@ -2416,22 +2409,6 @@ var axiosClient = {
|
|
|
2416
2409
|
const getBaseUrl = (baseUrl, hardService) => {
|
|
2417
2410
|
return `${baseUrl.replace(/\/$/, "")}/${hardService || sessionStorage2.getMenuFocus().service || config?.default_service}/api/v2`;
|
|
2418
2411
|
};
|
|
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
2412
|
const getHeaders = (header) => {
|
|
2436
2413
|
const headers = {
|
|
2437
2414
|
headers: {
|
package/dist/environment.mjs
CHANGED
|
@@ -2244,8 +2244,6 @@ 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);
|
|
2249
2247
|
let token = null;
|
|
2250
2248
|
if (useActionToken && actionToken) {
|
|
2251
2249
|
token = actionToken;
|
|
@@ -2290,7 +2288,6 @@ var axiosClient = {
|
|
|
2290
2288
|
originalRequest,
|
|
2291
2289
|
token
|
|
2292
2290
|
);
|
|
2293
|
-
ensureApiV2(originalRequest);
|
|
2294
2291
|
return instance.request(originalRequest);
|
|
2295
2292
|
}).catch(async (err) => {
|
|
2296
2293
|
if ((err.response?.status === 400 || err.response?.status === 401) && ["invalid_grant"].includes(err.response.data.error)) {
|
|
@@ -2314,16 +2311,13 @@ var axiosClient = {
|
|
|
2314
2311
|
}).filter(([_, value]) => !!value)
|
|
2315
2312
|
);
|
|
2316
2313
|
return new Promise(function(resolve) {
|
|
2317
|
-
|
|
2318
|
-
|
|
2319
|
-
|
|
2320
|
-
|
|
2321
|
-
|
|
2322
|
-
"Content-Type": config.refreshTokenEndpoint ? "application/x-www-form-urlencoded" : "multipart/form-data",
|
|
2323
|
-
Authorization: `Bearer ${accessTokenExp}`
|
|
2324
|
-
}
|
|
2314
|
+
const refreshPath = config.refreshTokenEndpoint ? config.refreshTokenEndpoint : `/api/v2${"/authentication/oauth2/token" /* AUTH_TOKEN_PATH */}`;
|
|
2315
|
+
axios.post(`${config?.baseUrl}${refreshPath}`, payload, {
|
|
2316
|
+
headers: {
|
|
2317
|
+
"Content-Type": config.refreshTokenEndpoint ? "application/x-www-form-urlencoded" : "multipart/form-data",
|
|
2318
|
+
Authorization: `Bearer ${accessTokenExp}`
|
|
2325
2319
|
}
|
|
2326
|
-
).then(async (res) => {
|
|
2320
|
+
}).then(async (res) => {
|
|
2327
2321
|
const data = res.data;
|
|
2328
2322
|
await localStorage2.setToken(data.access_token);
|
|
2329
2323
|
await localStorage2.setRefreshToken(data.refresh_token);
|
|
@@ -2334,7 +2328,6 @@ var axiosClient = {
|
|
|
2334
2328
|
data.access_token
|
|
2335
2329
|
);
|
|
2336
2330
|
processQueue(null, data.access_token);
|
|
2337
|
-
ensureApiV2(originalRequest);
|
|
2338
2331
|
resolve(instance.request(originalRequest));
|
|
2339
2332
|
}).catch(async (err) => {
|
|
2340
2333
|
console.log("catch error: ", err);
|
|
@@ -2378,22 +2371,6 @@ var axiosClient = {
|
|
|
2378
2371
|
const getBaseUrl = (baseUrl, hardService) => {
|
|
2379
2372
|
return `${baseUrl.replace(/\/$/, "")}/${hardService || sessionStorage2.getMenuFocus().service || config?.default_service}/api/v2`;
|
|
2380
2373
|
};
|
|
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
2374
|
const getHeaders = (header) => {
|
|
2398
2375
|
const headers = {
|
|
2399
2376
|
headers: {
|
package/dist/provider.js
CHANGED
|
@@ -5919,8 +5919,6 @@ 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);
|
|
5924
5922
|
let token = null;
|
|
5925
5923
|
if (useActionToken && actionToken) {
|
|
5926
5924
|
token = actionToken;
|
|
@@ -5965,7 +5963,6 @@ var axiosClient = {
|
|
|
5965
5963
|
originalRequest,
|
|
5966
5964
|
token
|
|
5967
5965
|
);
|
|
5968
|
-
ensureApiV2(originalRequest);
|
|
5969
5966
|
return instance.request(originalRequest);
|
|
5970
5967
|
}).catch(async (err) => {
|
|
5971
5968
|
if ((err.response?.status === 400 || err.response?.status === 401) && ["invalid_grant"].includes(err.response.data.error)) {
|
|
@@ -5989,16 +5986,13 @@ var axiosClient = {
|
|
|
5989
5986
|
}).filter(([_, value]) => !!value)
|
|
5990
5987
|
);
|
|
5991
5988
|
return new Promise(function(resolve) {
|
|
5992
|
-
|
|
5993
|
-
|
|
5994
|
-
|
|
5995
|
-
|
|
5996
|
-
|
|
5997
|
-
"Content-Type": config.refreshTokenEndpoint ? "application/x-www-form-urlencoded" : "multipart/form-data",
|
|
5998
|
-
Authorization: `Bearer ${accessTokenExp}`
|
|
5999
|
-
}
|
|
5989
|
+
const refreshPath = config.refreshTokenEndpoint ? config.refreshTokenEndpoint : `/api/v2${"/authentication/oauth2/token" /* AUTH_TOKEN_PATH */}`;
|
|
5990
|
+
import_axios.default.post(`${config?.baseUrl}${refreshPath}`, payload, {
|
|
5991
|
+
headers: {
|
|
5992
|
+
"Content-Type": config.refreshTokenEndpoint ? "application/x-www-form-urlencoded" : "multipart/form-data",
|
|
5993
|
+
Authorization: `Bearer ${accessTokenExp}`
|
|
6000
5994
|
}
|
|
6001
|
-
).then(async (res) => {
|
|
5995
|
+
}).then(async (res) => {
|
|
6002
5996
|
const data = res.data;
|
|
6003
5997
|
await localStorage2.setToken(data.access_token);
|
|
6004
5998
|
await localStorage2.setRefreshToken(data.refresh_token);
|
|
@@ -6009,7 +6003,6 @@ var axiosClient = {
|
|
|
6009
6003
|
data.access_token
|
|
6010
6004
|
);
|
|
6011
6005
|
processQueue(null, data.access_token);
|
|
6012
|
-
ensureApiV2(originalRequest);
|
|
6013
6006
|
resolve(instance.request(originalRequest));
|
|
6014
6007
|
}).catch(async (err) => {
|
|
6015
6008
|
console.log("catch error: ", err);
|
|
@@ -6053,22 +6046,6 @@ var axiosClient = {
|
|
|
6053
6046
|
const getBaseUrl = (baseUrl, hardService) => {
|
|
6054
6047
|
return `${baseUrl.replace(/\/$/, "")}/${hardService || sessionStorage2.getMenuFocus().service || config?.default_service}/api/v2`;
|
|
6055
6048
|
};
|
|
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
6049
|
const getHeaders = (header) => {
|
|
6073
6050
|
const headers = {
|
|
6074
6051
|
headers: {
|
package/dist/provider.mjs
CHANGED
|
@@ -5876,8 +5876,6 @@ 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);
|
|
5881
5879
|
let token = null;
|
|
5882
5880
|
if (useActionToken && actionToken) {
|
|
5883
5881
|
token = actionToken;
|
|
@@ -5922,7 +5920,6 @@ var axiosClient = {
|
|
|
5922
5920
|
originalRequest,
|
|
5923
5921
|
token
|
|
5924
5922
|
);
|
|
5925
|
-
ensureApiV2(originalRequest);
|
|
5926
5923
|
return instance.request(originalRequest);
|
|
5927
5924
|
}).catch(async (err) => {
|
|
5928
5925
|
if ((err.response?.status === 400 || err.response?.status === 401) && ["invalid_grant"].includes(err.response.data.error)) {
|
|
@@ -5946,16 +5943,13 @@ var axiosClient = {
|
|
|
5946
5943
|
}).filter(([_, value]) => !!value)
|
|
5947
5944
|
);
|
|
5948
5945
|
return new Promise(function(resolve) {
|
|
5949
|
-
|
|
5950
|
-
|
|
5951
|
-
|
|
5952
|
-
|
|
5953
|
-
|
|
5954
|
-
"Content-Type": config.refreshTokenEndpoint ? "application/x-www-form-urlencoded" : "multipart/form-data",
|
|
5955
|
-
Authorization: `Bearer ${accessTokenExp}`
|
|
5956
|
-
}
|
|
5946
|
+
const refreshPath = config.refreshTokenEndpoint ? config.refreshTokenEndpoint : `/api/v2${"/authentication/oauth2/token" /* AUTH_TOKEN_PATH */}`;
|
|
5947
|
+
axios.post(`${config?.baseUrl}${refreshPath}`, payload, {
|
|
5948
|
+
headers: {
|
|
5949
|
+
"Content-Type": config.refreshTokenEndpoint ? "application/x-www-form-urlencoded" : "multipart/form-data",
|
|
5950
|
+
Authorization: `Bearer ${accessTokenExp}`
|
|
5957
5951
|
}
|
|
5958
|
-
).then(async (res) => {
|
|
5952
|
+
}).then(async (res) => {
|
|
5959
5953
|
const data = res.data;
|
|
5960
5954
|
await localStorage2.setToken(data.access_token);
|
|
5961
5955
|
await localStorage2.setRefreshToken(data.refresh_token);
|
|
@@ -5966,7 +5960,6 @@ var axiosClient = {
|
|
|
5966
5960
|
data.access_token
|
|
5967
5961
|
);
|
|
5968
5962
|
processQueue(null, data.access_token);
|
|
5969
|
-
ensureApiV2(originalRequest);
|
|
5970
5963
|
resolve(instance.request(originalRequest));
|
|
5971
5964
|
}).catch(async (err) => {
|
|
5972
5965
|
console.log("catch error: ", err);
|
|
@@ -6010,22 +6003,6 @@ var axiosClient = {
|
|
|
6010
6003
|
const getBaseUrl = (baseUrl, hardService) => {
|
|
6011
6004
|
return `${baseUrl.replace(/\/$/, "")}/${hardService || sessionStorage2.getMenuFocus().service || config?.default_service}/api/v2`;
|
|
6012
6005
|
};
|
|
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
6006
|
const getHeaders = (header) => {
|
|
6030
6007
|
const headers = {
|
|
6031
6008
|
headers: {
|