phx-uikit 1.0.152 → 1.0.154

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.
@@ -48,10 +48,9 @@ var getAuthHeaders = function () {
48
48
  return {};
49
49
  };
50
50
  PHXAxiosInstance.interceptors.request.use(function (config) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
51
- var currentSession, authTokenCookie, _a, _b, err_1;
52
- var _c;
53
- return tslib_1.__generator(this, function (_d) {
54
- switch (_d.label) {
51
+ var currentSession, authTokenCookie, _a, _b;
52
+ return tslib_1.__generator(this, function (_c) {
53
+ switch (_c.label) {
55
54
  case 0:
56
55
  currentSession = (0, getCookieSession_1["default"])();
57
56
  _a = (currentSession === null || currentSession === void 0 ? void 0 : currentSession.access_token);
@@ -61,45 +60,27 @@ PHXAxiosInstance.interceptors.request.use(function (config) { return tslib_1.__a
61
60
  return [3 /*break*/, 3];
62
61
  case 1: return [4 /*yield*/, convertAuthToken()];
63
62
  case 2:
64
- _b = _d.sent();
65
- _d.label = 3;
63
+ _b = _c.sent();
64
+ _c.label = 3;
66
65
  case 3:
67
66
  _a = (_b);
68
- _d.label = 4;
67
+ _c.label = 4;
69
68
  case 4:
70
69
  authTokenCookie = _a;
71
- if (!authTokenCookie) return [3 /*break*/, 8];
72
- config.headers.Authorization = "Bearer ".concat(authTokenCookie);
73
- if (!isServer) return [3 /*break*/, 8];
74
- _d.label = 5;
75
- case 5:
76
- _d.trys.push([5, 7, , 8]);
77
- return [4 /*yield*/, axios_1["default"].post("http://localhost:8100/authen/authenticate", {}, {
78
- headers: tslib_1.__assign({ Authorization: "Bearer ".concat(authTokenCookie) }, getAuthHeaders())
79
- })];
80
- case 6:
81
- _d.sent();
82
- return [3 /*break*/, 8];
83
- case 7:
84
- err_1 = _d.sent();
85
- console.log('chạy vào đây', err_1);
86
- if (((_c = err_1.response) === null || _c === void 0 ? void 0 : _c.status) !== 401) {
87
- console.log('chạy vào đây', 401);
88
- throw err_1;
70
+ if (authTokenCookie) {
71
+ config.headers.Authorization = "Bearer ".concat(authTokenCookie);
89
72
  }
90
- return [3 /*break*/, 8];
91
- case 8: return [2 /*return*/, config];
73
+ return [2 /*return*/, config];
92
74
  }
93
75
  });
94
76
  }); });
95
77
  PHXAxiosInstance.interceptors.response.use(function (response) { return response; }, function (error) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
96
- var originalRequest, data, newToken, currentSession, err_2;
78
+ var originalRequest, data, newToken, currentSession, err_1;
97
79
  var _a;
98
80
  return tslib_1.__generator(this, function (_b) {
99
81
  switch (_b.label) {
100
82
  case 0:
101
83
  originalRequest = error.config;
102
- console.log('hjkashdasd', error);
103
84
  if (!(((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === 401 && !originalRequest._retry)) return [3 /*break*/, 5];
104
85
  if (isRefreshing) {
105
86
  return [2 /*return*/, new Promise(function (resolve, reject) {
@@ -135,13 +116,13 @@ PHXAxiosInstance.interceptors.response.use(function (response) { return response
135
116
  originalRequest.headers.Authorization = 'Bearer ' + newToken;
136
117
  return [2 /*return*/, PHXAxiosInstance(originalRequest)];
137
118
  case 3:
138
- err_2 = _b.sent();
139
- processQueue(err_2, null);
119
+ err_1 = _b.sent();
120
+ processQueue(err_1, null);
140
121
  if (!isServer) {
141
122
  js_cookie_1["default"].remove(constants_1.COOKIE_SESSION_SIGN_IN);
142
123
  window.location.href = constants_1.loginPage;
143
124
  }
144
- return [2 /*return*/, Promise.reject(err_2)];
125
+ return [2 /*return*/, Promise.reject(err_1)];
145
126
  case 4:
146
127
  isRefreshing = false;
147
128
  return [7 /*endfinally*/];
@@ -1 +1 @@
1
- {"version":3,"file":"axiosInstance.js","sourceRoot":"","sources":["../../src/axiosInstance.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"axiosInstance.js","sourceRoot":"","sources":["../../src/axiosInstance.ts"],"names":[],"mappings":";;;;AAAA,wDAAyB;AACzB,gEAA+B;AAC/B,qDAA0C;AAC1C,+CAAiG;AACjG,kGAAmE;AACnE,gGAAwE;AACxE,wCAA+C;AAE/C,IAAI,YAAY,GAAG,KAAK,CAAA;AACxB,IAAI,WAAW,GAAU,EAAE,CAAA;AAC3B,IAAM,SAAS,GAAG,IAAA,wBAAM,EAAC,yBAAyB,EAAE,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAA;AACxF,IAAM,QAAQ,GAAG,OAAO,MAAM,KAAK,WAAW,CAAA;AAC9C,IAAM,YAAY,GAAG,UAAC,KAAU,EAAE,KAA2B;IAA3B,sBAAA,EAAA,YAA2B;IAC3D,WAAW,CAAC,OAAO,CAAC,UAAC,IAAI;QACvB,IAAI,KAAK,EAAE;YACT,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;SACnB;aAAM;YACL,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;SACpB;IACH,CAAC,CAAC,CAAA;IACF,WAAW,GAAG,EAAE,CAAA;AAClB,CAAC,CAAA;AAED,IAAM,gBAAgB,GAAG,kBAAK,CAAC,MAAM,CAAC;IACpC,OAAO,EAAE,SAAS;CACnB,CAAC,CAAA;AA+GO,4CAAgB;AA7GzB,IAAM,cAAc,GAAG;IACrB,IAAI,QAAQ,EAAE;QACZ,cAAc;QACd,IAAM,WAAW,GAAG,IAAA,iBAAO,GAAE,CAAA;QAC7B,IAAM,YAAY,GAAG,WAAW;aAC7B,MAAM,EAAE;aACR,GAAG,CAAC,UAAC,EAAe;gBAAb,IAAI,UAAA,EAAE,KAAK,WAAA;YAAO,OAAA,UAAG,IAAI,cAAI,KAAK,CAAE;QAAlB,CAAkB,CAAC;aAC5C,IAAI,CAAC,IAAI,CAAC,CAAA;QAEb,OAAO;YACL,MAAM,EAAE,YAAY;YACpB,QAAQ,EAAE,IAAA,iBAAO,GAAE,CAAC,GAAG,CAAC,QAAQ,CAAC;SAClC,CAAA;KACF;IACD,OAAO,EAAE,CAAA;AACX,CAAC,CAAA;AAED,gBAAgB,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,UAAO,MAAM;;;;;gBAC/C,cAAc,GAAG,IAAA,6BAAuB,GAAE,CAAA;sBACxB,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,YAAY;;qBAAK,QAAQ,EAAR,wBAAQ;gBAAG,KAAA,IAAI,CAAA;;oBAAG,qBAAM,gBAAgB,EAAE,EAAA;;gBAAxB,KAAA,SAAwB,CAAA;;;gBAA3C,KAAA,IAA4C,CAAA;;;gBAA9F,eAAe,KAA+E;gBAEpG,IAAI,eAAe,EAAE;oBACnB,MAAM,CAAC,OAAO,CAAC,aAAa,GAAG,iBAAU,eAAe,CAAE,CAAA;iBAC3D;gBAED,sBAAO,MAAM,EAAA;;;KACd,CAAC,CAAA;AAEF,gBAAgB,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CACxC,UAAC,QAAQ,IAAK,OAAA,QAAQ,EAAR,CAAQ,EACtB,UAAO,KAAK;;;;;;gBACJ,eAAe,GAAG,KAAK,CAAC,MAAM,CAAA;qBAEhC,CAAA,CAAA,MAAA,KAAK,CAAC,QAAQ,0CAAE,MAAM,MAAK,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAA,EAAzD,wBAAyD;gBAC3D,IAAI,YAAY,EAAE;oBAChB,sBAAO,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;4BACjC,WAAW,CAAC,IAAI,CAAC;gCACf,OAAO,EAAE,UAAC,KAAa;oCACrB,eAAe,CAAC,OAAO,CAAC,aAAa,GAAG,SAAS,GAAG,KAAK,CAAA;oCACzD,OAAO,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAAC,CAAA;gCAC5C,CAAC;gCACD,MAAM,EAAE,UAAC,GAAQ,IAAK,OAAA,MAAM,CAAC,GAAG,CAAC,EAAX,CAAW;6BAClC,CAAC,CAAA;wBACJ,CAAC,CAAC,EAAA;iBACH;gBAED,eAAe,CAAC,MAAM,GAAG,IAAI,CAAA;gBAC7B,YAAY,GAAG,IAAI,CAAA;;;;gBAEA,qBAAM,kBAAK,CAAC,IAAI,CAC/B,gDAAgD,EAChD,EAAE,EACF;wBACE,OAAO,EAAE,cAAc,EAAE;wBACzB,eAAe,EAAE,IAAI;qBACtB,CACF,EAAA;;gBAPO,IAAI,GAAK,CAAA,SAOhB,CAAA,KAPW;gBAQN,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAA;gBAErB,cAAc,GAAG,IAAA,6BAAuB,GAAE,CAAA;gBAChD,IAAA,8BAAiB,EAAC,EAAE,KAAK,wCAAO,cAAc,KAAE,YAAY,EAAE,QAAQ,GAAE,EAAE,CAAC,CAAA;gBAC3E,4BAA4B;gBAC5B,IAAI,CAAC,QAAQ,EAAE;oBACb,sBAAO,CAAC,MAAM,CAAC,sBAAU,CAAC,CAAA;oBAC1B,YAAY,CAAC,UAAU,CAAC,0BAAc,CAAC,CAAA;iBACxC;gBAED,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;gBAC5B,eAAe,CAAC,OAAO,CAAC,aAAa,GAAG,SAAS,GAAG,QAAQ,CAAA;gBAC5D,sBAAO,gBAAgB,CAAC,eAAe,CAAC,EAAA;;;gBAExC,YAAY,CAAC,KAAG,EAAE,IAAI,CAAC,CAAA;gBACvB,IAAI,CAAC,QAAQ,EAAE;oBACb,sBAAO,CAAC,MAAM,CAAC,kCAAsB,CAAC,CAAA;oBACtC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,qBAAS,CAAA;iBACjC;gBACD,sBAAO,OAAO,CAAC,MAAM,CAAC,KAAG,CAAC,EAAA;;gBAE1B,YAAY,GAAG,KAAK,CAAA;;oBAIxB,sBAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAA;;;KAC7B,CACF,CAAA;AAED,+CAA+C;AAC/C,IAAM,gBAAgB,GAAG;;;;;;gBAEf,SAAS,GAAG,CAAC,QAAQ,IAAI,IAAI,CAAC,KAAK,CAAC,sBAAO,CAAC,GAAG,CAAC,sBAAU,CAAW,CAAC,CAAC,KAAK,CAAA;gBAEjE,qBAAM,kBAAK,CAAC,IAAI,CAC/B,sCAAsC,EACtC,EAAE,SAAS,WAAA,EAAE,EACb;wBACE,eAAe,EAAE,IAAI;qBACtB,CACF,EAAA;;gBANO,IAAI,GAAK,CAAA,SAMhB,CAAA,KANW;gBAON,WAAW,GAAG,IAAI,CAAC,KAAK,CAAA;gBACxB,cAAc,GAAG,IAAA,6BAAuB,GAAE,CAAA;gBAChD,IAAA,8BAAiB,EAAC,EAAE,KAAK,wCAAO,cAAc,KAAE,YAAY,EAAE,WAAW,GAAE,EAAE,CAAC,CAAA;gBAC9E,sBAAO,CAAC,MAAM,CAAC,sBAAU,CAAC,CAAA;gBAC1B,sBAAO,WAAW,EAAA;;;gBAElB,OAAO,CAAC,GAAG,CAAC,GAAC,CAAC,CAAA;gBACd,sBAAM;;;;KAET,CAAA"}
@@ -44,10 +44,9 @@ var getAuthHeaders = function () {
44
44
  return {};
45
45
  };
46
46
  PHXAxiosInstance.interceptors.request.use(function (config) { return __awaiter(void 0, void 0, void 0, function () {
47
- var currentSession, authTokenCookie, _a, _b, err_1;
48
- var _c;
49
- return __generator(this, function (_d) {
50
- switch (_d.label) {
47
+ var currentSession, authTokenCookie, _a, _b;
48
+ return __generator(this, function (_c) {
49
+ switch (_c.label) {
51
50
  case 0:
52
51
  currentSession = PHXFuncGetCookieSession();
53
52
  _a = (currentSession === null || currentSession === void 0 ? void 0 : currentSession.access_token);
@@ -57,45 +56,27 @@ PHXAxiosInstance.interceptors.request.use(function (config) { return __awaiter(v
57
56
  return [3 /*break*/, 3];
58
57
  case 1: return [4 /*yield*/, convertAuthToken()];
59
58
  case 2:
60
- _b = _d.sent();
61
- _d.label = 3;
59
+ _b = _c.sent();
60
+ _c.label = 3;
62
61
  case 3:
63
62
  _a = (_b);
64
- _d.label = 4;
63
+ _c.label = 4;
65
64
  case 4:
66
65
  authTokenCookie = _a;
67
- if (!authTokenCookie) return [3 /*break*/, 8];
68
- config.headers.Authorization = "Bearer ".concat(authTokenCookie);
69
- if (!isServer) return [3 /*break*/, 8];
70
- _d.label = 5;
71
- case 5:
72
- _d.trys.push([5, 7, , 8]);
73
- return [4 /*yield*/, axios.post("http://localhost:8100/authen/authenticate", {}, {
74
- headers: __assign({ Authorization: "Bearer ".concat(authTokenCookie) }, getAuthHeaders())
75
- })];
76
- case 6:
77
- _d.sent();
78
- return [3 /*break*/, 8];
79
- case 7:
80
- err_1 = _d.sent();
81
- console.log('chạy vào đây', err_1);
82
- if (((_c = err_1.response) === null || _c === void 0 ? void 0 : _c.status) !== 401) {
83
- console.log('chạy vào đây', 401);
84
- throw err_1;
66
+ if (authTokenCookie) {
67
+ config.headers.Authorization = "Bearer ".concat(authTokenCookie);
85
68
  }
86
- return [3 /*break*/, 8];
87
- case 8: return [2 /*return*/, config];
69
+ return [2 /*return*/, config];
88
70
  }
89
71
  });
90
72
  }); });
91
73
  PHXAxiosInstance.interceptors.response.use(function (response) { return response; }, function (error) { return __awaiter(void 0, void 0, void 0, function () {
92
- var originalRequest, data, newToken, currentSession, err_2;
74
+ var originalRequest, data, newToken, currentSession, err_1;
93
75
  var _a;
94
76
  return __generator(this, function (_b) {
95
77
  switch (_b.label) {
96
78
  case 0:
97
79
  originalRequest = error.config;
98
- console.log('hjkashdasd', error);
99
80
  if (!(((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === 401 && !originalRequest._retry)) return [3 /*break*/, 5];
100
81
  if (isRefreshing) {
101
82
  return [2 /*return*/, new Promise(function (resolve, reject) {
@@ -131,13 +112,13 @@ PHXAxiosInstance.interceptors.response.use(function (response) { return response
131
112
  originalRequest.headers.Authorization = 'Bearer ' + newToken;
132
113
  return [2 /*return*/, PHXAxiosInstance(originalRequest)];
133
114
  case 3:
134
- err_2 = _b.sent();
135
- processQueue(err_2, null);
115
+ err_1 = _b.sent();
116
+ processQueue(err_1, null);
136
117
  if (!isServer) {
137
118
  Cookies.remove(COOKIE_SESSION_SIGN_IN);
138
119
  window.location.href = loginPage;
139
120
  }
140
- return [2 /*return*/, Promise.reject(err_2)];
121
+ return [2 /*return*/, Promise.reject(err_1)];
141
122
  case 4:
142
123
  isRefreshing = false;
143
124
  return [7 /*endfinally*/];
@@ -1 +1 @@
1
- {"version":3,"file":"axiosInstance.js","sourceRoot":"","sources":["../../src/axiosInstance.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"axiosInstance.js","sourceRoot":"","sources":["../../src/axiosInstance.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "phx-uikit",
3
- "version": "1.0.152",
3
+ "version": "1.0.154",
4
4
  "description": "PHX REACT",
5
5
  "main": "./dist/cjs/index.js",
6
6
  "module": "./dist/esm/index.js",