@dexteel/mesf-core 4.23.0 → 4.23.1

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.
Files changed (5) hide show
  1. package/.release-please-manifest.json +1 -1
  2. package/CHANGELOG.md +7 -0
  3. package/dist/index.esm.js +112 -132
  4. package/dist/index.esm.js.map +1 -1
  5. package/package.json +1 -1
package/.release-please-manifest.json CHANGED
@@ -1,3 +1,3 @@
1
1
  {
2
- ".": "4.23.0"
2
+ ".": "4.23.1"
3
3
  }
package/CHANGELOG.md CHANGED
@@ -1,5 +1,12 @@
1
1
  # Changelog
2
2
 
3
+ ## [4.23.1](https://github.com/dexteel/mesf-core-frontend/compare/@dexteel/mesf-core-v4.23.0...@dexteel/mesf-core-v4.23.1) (2025-02-03)
4
+
5
+
6
+ ### Bug Fixes
7
+
8
+ * **API Service:** use axiosInstance inside callV2 method ([9647d1d](https://github.com/dexteel/mesf-core-frontend/commit/9647d1d22c7a8fbf7abc4b728c43ce9c35e6c8d3))
9
+
3
10
  ## [4.23.0](https://github.com/dexteel/mesf-core-frontend/compare/@dexteel/mesf-core-v4.22.6...@dexteel/mesf-core-v4.23.0) (2025-02-03)
4
11
 
5
12
 
package/dist/index.esm.js CHANGED
@@ -7163,6 +7163,107 @@ var Configuration$1 = /** @class */ (function () {
7163
7163
  return Configuration;
7164
7164
  }());
7165
7165
 
7166
+ var _a;
7167
+ var base$2 = document.getElementsByTagName("base")[0].getAttribute("href") || "/";
7168
+ function renewToken() {
7169
+ return __awaiter(this, void 0, void 0, function () {
7170
+ var refreshToken, config, fd, response, token;
7171
+ return __generator(this, function (_a) {
7172
+ switch (_a.label) {
7173
+ case 0:
7174
+ refreshToken = localStorage.getItem("refreshToken");
7175
+ if (!refreshToken) {
7176
+ throw new Error("refresh token does not exist");
7177
+ }
7178
+ config = new Configuration$1();
7179
+ fd = new FormData();
7180
+ fd.append("refreshToken", refreshToken);
7181
+ return [4 /*yield*/, axios.post("".concat(config.API_AUTH_URL, "/refresh"), fd, {
7182
+ headers: {
7183
+ "Content-Type": "application/json"
7184
+ },
7185
+ params: {
7186
+ refreshToken: refreshToken
7187
+ }
7188
+ })];
7189
+ case 1:
7190
+ response = _a.sent();
7191
+ token = response.data.result;
7192
+ if (token) {
7193
+ return [2 /*return*/, [token, refreshToken]];
7194
+ }
7195
+ else {
7196
+ throw new Error("Token is not valid");
7197
+ }
7198
+ }
7199
+ });
7200
+ });
7201
+ }
7202
+ function isUnauthorizedError(error) {
7203
+ var status = error.response.status;
7204
+ return status === 499 || status === 499; // custom status code
7205
+ }
7206
+ var axiosInstance = axios.create({
7207
+ headers: {
7208
+ Authorization: "Bearer ".concat((_a = localStorage.getItem("token")) !== null && _a !== void 0 ? _a : "")
7209
+ }
7210
+ });
7211
+ var refreshingFunc;
7212
+ axiosInstance.interceptors.response.use(function (res) { return res; }, function (error) { return __awaiter(void 0, void 0, void 0, function () {
7213
+ var originalConfig, token, _a, newToken, newRefreshToken, innerError_1, err_1;
7214
+ return __generator(this, function (_b) {
7215
+ switch (_b.label) {
7216
+ case 0:
7217
+ originalConfig = error.config;
7218
+ if (originalConfig.headers.MESF_Retries === 1) {
7219
+ localStorage.removeItem("token");
7220
+ localStorage.removeItem("refreshToken");
7221
+ window.location.href = "".concat(base$2, "logout?message=Session%20expired&redirectTo=").concat(window.location.href);
7222
+ return [2 /*return*/, Promise.reject(error)];
7223
+ }
7224
+ token = getTokenFromLS();
7225
+ if (!token || !isUnauthorizedError(error)) {
7226
+ return [2 /*return*/, Promise.reject(error)];
7227
+ }
7228
+ _b.label = 1;
7229
+ case 1:
7230
+ _b.trys.push([1, 7, 8, 9]);
7231
+ if (!refreshingFunc)
7232
+ refreshingFunc = renewToken();
7233
+ return [4 /*yield*/, refreshingFunc];
7234
+ case 2:
7235
+ _a = _b.sent(), newToken = _a[0], newRefreshToken = _a[1];
7236
+ localStorage.setItem("token", newToken);
7237
+ localStorage.setItem("refreshToken", newRefreshToken);
7238
+ axiosInstance.defaults.headers.Authorization = "Bearer ".concat(newToken);
7239
+ originalConfig.headers.Authorization = "Bearer ".concat(newToken);
7240
+ originalConfig.headers.MESF_Retries = 1;
7241
+ _b.label = 3;
7242
+ case 3:
7243
+ _b.trys.push([3, 5, , 6]);
7244
+ return [4 /*yield*/, axios.request(originalConfig)];
7245
+ case 4: return [2 /*return*/, _b.sent()];
7246
+ case 5:
7247
+ innerError_1 = _b.sent();
7248
+ if (isUnauthorizedError(innerError_1)) {
7249
+ return [2 /*return*/, Promise.reject(innerError_1)];
7250
+ }
7251
+ return [2 /*return*/, Promise.reject(innerError_1)];
7252
+ case 6: return [3 /*break*/, 9];
7253
+ case 7:
7254
+ err_1 = _b.sent();
7255
+ localStorage.removeItem("token");
7256
+ localStorage.removeItem("refreshToken");
7257
+ window.location.href = "".concat(base$2, "logout?message=Session%20expired&redirectTo=").concat(window.location.href);
7258
+ return [2 /*return*/, Promise.reject(err_1)];
7259
+ case 8:
7260
+ refreshingFunc = undefined;
7261
+ return [7 /*endfinally*/];
7262
+ case 9: return [2 /*return*/];
7263
+ }
7264
+ });
7265
+ }); });
7266
+
7166
7267
  var getError = function (error) {
7167
7268
  var arrayOfErrors = values(get$1(error, "response.data.errors", null));
7168
7269
  var allErrors = "";
@@ -7214,7 +7315,7 @@ var FetchError = /** @class */ (function (_super) {
7214
7315
  return FetchError;
7215
7316
  }(Error));
7216
7317
 
7217
- var base$2 = document.getElementsByTagName("base")[0].getAttribute("href") || "/";
7318
+ var base$1 = document.getElementsByTagName("base")[0].getAttribute("href") || "/";
7218
7319
  var MESApiService = /** @class */ (function () {
7219
7320
  function MESApiService() {
7220
7321
  this.config = new Configuration$1();
@@ -7428,7 +7529,7 @@ var MESApiService = /** @class */ (function () {
7428
7529
  })
7429
7530
  .then(function (response) {
7430
7531
  if (response.status === 499 || response.status === 401) {
7431
- window.location.href = "".concat(base$2, "logout?message=Session%20expired&redirectTo=").concat(window.location.href);
7532
+ window.location.href = "".concat(base$1, "logout?message=Session%20expired&redirectTo=").concat(window.location.href);
7432
7533
  }
7433
7534
  isError = {
7434
7535
  ok: response.ok,
@@ -7452,7 +7553,7 @@ var MESApiService = /** @class */ (function () {
7452
7553
  MESApiService.prototype.callV2 = function (procedure, parameters, database) {
7453
7554
  if (database === void 0) { database = ""; }
7454
7555
  return __awaiter(this, void 0, void 0, function () {
7455
- var data, formattedParameters, response, resp, err_1;
7556
+ var data, formattedParameters, response, err_1;
7456
7557
  return __generator(this, function (_a) {
7457
7558
  switch (_a.label) {
7458
7559
  case 0:
@@ -7475,38 +7576,18 @@ var MESApiService = /** @class */ (function () {
7475
7576
  }; // eslint-disable-line
7476
7577
  _a.label = 1;
7477
7578
  case 1:
7478
- _a.trys.push([1, 4, , 5]);
7479
- return [4 /*yield*/, fetch(this.config.API_PROCEDURE_URL + "/Execute", {
7480
- method: "POST",
7481
- mode: "cors",
7482
- headers: {
7483
- "Content-Type": "application/json",
7484
- Authorization: "Bearer " + getTokenFromLS()
7485
- },
7486
- body: JSON.stringify(data)
7487
- })];
7579
+ _a.trys.push([1, 3, , 4]);
7580
+ return [4 /*yield*/, axiosInstance.post(this.config.API_PROCEDURE_URL + "/Execute", data)];
7488
7581
  case 2:
7489
7582
  response = _a.sent();
7490
- if (response.status === 401 || response.status === 499) {
7491
- window.location.href = "".concat(base$2, "logout?message=Session%20expired&redirectTo=").concat(window.location.href);
7492
- }
7493
- return [4 /*yield*/, response.json()];
7583
+ return [2 /*return*/, { ok: true, data: response.data }];
7494
7584
  case 3:
7495
- resp = _a.sent();
7496
- if (!response.ok) {
7497
- return [2 /*return*/, {
7498
- ok: false,
7499
- message: resp.message
7500
- }];
7501
- }
7502
- return [2 /*return*/, { ok: true, data: resp }];
7503
- case 4:
7504
7585
  err_1 = _a.sent();
7505
7586
  // console.log("fromCatch", err);
7506
7587
  this.hasErrors = true;
7507
7588
  this.error = err_1;
7508
7589
  return [2 /*return*/, { ok: false, message: err_1.toString() }];
7509
- case 5: return [2 /*return*/];
7590
+ case 4: return [2 /*return*/];
7510
7591
  }
7511
7592
  });
7512
7593
  });
@@ -7548,7 +7629,7 @@ var MESApiService = /** @class */ (function () {
7548
7629
  })
7549
7630
  .then(function (response) {
7550
7631
  if (response.status === 499 || response.status === 401) {
7551
- window.location.href = "".concat(base$2, "logout?message=Session%20expired&redirectTo=").concat(window.location.href);
7632
+ window.location.href = "".concat(base$1, "logout?message=Session%20expired&redirectTo=").concat(window.location.href);
7552
7633
  }
7553
7634
  isError = {
7554
7635
  ok: response.ok,
@@ -7609,7 +7690,7 @@ var MESApiService = /** @class */ (function () {
7609
7690
  })
7610
7691
  .then(function (response) {
7611
7692
  if (response.status === 499 || response.status === 401) {
7612
- window.location.href = "".concat(base$2, "logout?message=Session%20expired&redirectTo=").concat(window.location.href);
7693
+ window.location.href = "".concat(base$1, "logout?message=Session%20expired&redirectTo=").concat(window.location.href);
7613
7694
  }
7614
7695
  isError = {
7615
7696
  ok: response.ok,
@@ -7668,7 +7749,7 @@ var MESApiService = /** @class */ (function () {
7668
7749
  })
7669
7750
  .then(function (response) {
7670
7751
  if (response.status === 499 || response.status === 401) {
7671
- window.location.href = "".concat(base$2, "logout?message=Session%20expired&redirectTo=").concat(window.location.href);
7752
+ window.location.href = "".concat(base$1, "logout?message=Session%20expired&redirectTo=").concat(window.location.href);
7672
7753
  }
7673
7754
  isError = {
7674
7755
  ok: response.ok,
@@ -7744,7 +7825,7 @@ var MESApiService = /** @class */ (function () {
7744
7825
  })
7745
7826
  .then(function (response) {
7746
7827
  if (response.status === 499 || response.status === 401) {
7747
- window.location.href = "".concat(base$2, "logout?message=Session%20expired&redirectTo=").concat(window.location.href);
7828
+ window.location.href = "".concat(base$1, "logout?message=Session%20expired&redirectTo=").concat(window.location.href);
7748
7829
  }
7749
7830
  isError = {
7750
7831
  ok: response.ok,
@@ -8660,107 +8741,6 @@ function ChangePassword(props) {
8660
8741
  React__default.createElement(Button, { onClick: handleOk, color: "primary", disabled: !canChange }, "Change Password"))));
8661
8742
  }
8662
8743
 
8663
- var _a;
8664
- var base$1 = document.getElementsByTagName("base")[0].getAttribute("href") || "/";
8665
- function renewToken() {
8666
- return __awaiter(this, void 0, void 0, function () {
8667
- var refreshToken, config, fd, response, token;
8668
- return __generator(this, function (_a) {
8669
- switch (_a.label) {
8670
- case 0:
8671
- refreshToken = localStorage.getItem("refreshToken");
8672
- if (!refreshToken) {
8673
- throw new Error("refresh token does not exist");
8674
- }
8675
- config = new Configuration$1();
8676
- fd = new FormData();
8677
- fd.append("refreshToken", refreshToken);
8678
- return [4 /*yield*/, axios.post("".concat(config.API_AUTH_URL, "/refresh"), fd, {
8679
- headers: {
8680
- "Content-Type": "application/json"
8681
- },
8682
- params: {
8683
- refreshToken: refreshToken
8684
- }
8685
- })];
8686
- case 1:
8687
- response = _a.sent();
8688
- token = response.data.result;
8689
- if (token) {
8690
- return [2 /*return*/, [token, refreshToken]];
8691
- }
8692
- else {
8693
- throw new Error("Token is not valid");
8694
- }
8695
- }
8696
- });
8697
- });
8698
- }
8699
- function isUnauthorizedError(error) {
8700
- var status = error.response.status;
8701
- return status === 499 || status === 499; // custom status code
8702
- }
8703
- var axiosInstance = axios.create({
8704
- headers: {
8705
- Authorization: "Bearer ".concat((_a = localStorage.getItem("token")) !== null && _a !== void 0 ? _a : "")
8706
- }
8707
- });
8708
- var refreshingFunc;
8709
- axiosInstance.interceptors.response.use(function (res) { return res; }, function (error) { return __awaiter(void 0, void 0, void 0, function () {
8710
- var originalConfig, token, _a, newToken, newRefreshToken, innerError_1, err_1;
8711
- return __generator(this, function (_b) {
8712
- switch (_b.label) {
8713
- case 0:
8714
- originalConfig = error.config;
8715
- if (originalConfig.headers.MESF_Retries === 1) {
8716
- localStorage.removeItem("token");
8717
- localStorage.removeItem("refreshToken");
8718
- window.location.href = "".concat(base$1, "logout?message=Session%20expired&redirectTo=").concat(window.location.href);
8719
- return [2 /*return*/, Promise.reject(error)];
8720
- }
8721
- token = getTokenFromLS();
8722
- if (!token || !isUnauthorizedError(error)) {
8723
- return [2 /*return*/, Promise.reject(error)];
8724
- }
8725
- _b.label = 1;
8726
- case 1:
8727
- _b.trys.push([1, 7, 8, 9]);
8728
- if (!refreshingFunc)
8729
- refreshingFunc = renewToken();
8730
- return [4 /*yield*/, refreshingFunc];
8731
- case 2:
8732
- _a = _b.sent(), newToken = _a[0], newRefreshToken = _a[1];
8733
- localStorage.setItem("token", newToken);
8734
- localStorage.setItem("refreshToken", newRefreshToken);
8735
- axiosInstance.defaults.headers.Authorization = "Bearer ".concat(newToken);
8736
- originalConfig.headers.Authorization = "Bearer ".concat(newToken);
8737
- originalConfig.headers.MESF_Retries = 1;
8738
- _b.label = 3;
8739
- case 3:
8740
- _b.trys.push([3, 5, , 6]);
8741
- return [4 /*yield*/, axios.request(originalConfig)];
8742
- case 4: return [2 /*return*/, _b.sent()];
8743
- case 5:
8744
- innerError_1 = _b.sent();
8745
- if (isUnauthorizedError(innerError_1)) {
8746
- return [2 /*return*/, Promise.reject(innerError_1)];
8747
- }
8748
- return [2 /*return*/, Promise.reject(innerError_1)];
8749
- case 6: return [3 /*break*/, 9];
8750
- case 7:
8751
- err_1 = _b.sent();
8752
- localStorage.removeItem("token");
8753
- localStorage.removeItem("refreshToken");
8754
- window.location.href = "".concat(base$1, "logout?message=Session%20expired&redirectTo=").concat(window.location.href);
8755
- return [2 /*return*/, Promise.reject(err_1)];
8756
- case 8:
8757
- refreshingFunc = undefined;
8758
- return [7 /*endfinally*/];
8759
- case 9: return [2 /*return*/];
8760
- }
8761
- });
8762
- }); });
8763
-
8764
8744
  var UserInitialState = {
8765
8745
  userLastName: "",
8766
8746
  userId: null,