phx-uikit 1.0.215 → 1.0.216

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.
@@ -10,7 +10,7 @@ var getCookieSession_1 = tslib_1.__importDefault(require("./components/Func/getC
10
10
  var headers_1 = require("next/headers");
11
11
  var isServer = typeof window === 'undefined';
12
12
  var publicUrl = (0, read_env_config_1.getEnv)('NEXT_PUBLIC_API_GATEWAY', process.env.NEXT_PUBLIC_API_GATEWAY);
13
- var internalUrl = (0, read_env_config_1.getEnv)('NEXT_PUBLIC_API_GATEWAY_INTERNAL', process.env.NEXT_PUBLIC_API_GATEWAY_INTERNAL);
13
+ // const internalUrl = getEnv('NEXT_PUBLIC_API_GATEWAY_INTERNAL', process.env.NEXT_PUBLIC_API_GATEWAY_INTERNAL)
14
14
  // Dùng promise singleton để các request cùng chờ 1 lần refresh
15
15
  var refreshPromise = null;
16
16
  var PHXAxiosInstance = axios_1["default"].create({
@@ -88,36 +88,29 @@ var refreshAccessToken = function () { return tslib_1.__awaiter(void 0, void 0,
88
88
  });
89
89
  }); };
90
90
  PHXAxiosInstance.interceptors.request.use(function (config) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
91
- var currentSession, authToken, err_2, newToken;
92
- var _a;
93
- return tslib_1.__generator(this, function (_b) {
94
- switch (_b.label) {
91
+ var currentSession, token, err_2;
92
+ return tslib_1.__generator(this, function (_a) {
93
+ switch (_a.label) {
95
94
  case 0:
96
95
  currentSession = (0, getCookieSession_1["default"])();
97
- authToken = currentSession === null || currentSession === void 0 ? void 0 : currentSession.access_token;
98
- if (!authToken) return [3 /*break*/, 7];
99
- config.headers.Authorization = "Bearer ".concat(authToken);
100
- if (!isServer) return [3 /*break*/, 7];
101
- _b.label = 1;
96
+ token = (currentSession === null || currentSession === void 0 ? void 0 : currentSession.access_token) || null;
97
+ if (!refreshPromise) return [3 /*break*/, 4];
98
+ _a.label = 1;
102
99
  case 1:
103
- _b.trys.push([1, 3, , 7]);
104
- return [4 /*yield*/, axios_1["default"].post("".concat(internalUrl, "/authen/authenticate"), {}, {
105
- headers: tslib_1.__assign({ Authorization: "Bearer ".concat(authToken) }, getAuthHeaders())
106
- })];
100
+ _a.trys.push([1, 3, , 4]);
101
+ return [4 /*yield*/, refreshPromise];
107
102
  case 2:
108
- _b.sent();
109
- return [3 /*break*/, 7];
103
+ token = _a.sent();
104
+ return [3 /*break*/, 4];
110
105
  case 3:
111
- err_2 = _b.sent();
112
- if (!(((_a = err_2.response) === null || _a === void 0 ? void 0 : _a.status) === 401)) return [3 /*break*/, 5];
113
- return [4 /*yield*/, refreshAccessToken()];
106
+ err_2 = _a.sent();
107
+ console.warn('Token refresh failed in request');
108
+ return [3 /*break*/, 4];
114
109
  case 4:
115
- newToken = _b.sent();
116
- config.headers.Authorization = "Bearer ".concat(newToken);
117
- return [3 /*break*/, 6];
118
- case 5: throw err_2;
119
- case 6: return [3 /*break*/, 7];
120
- case 7: return [2 /*return*/, config];
110
+ if (token) {
111
+ config.headers.Authorization = "Bearer ".concat(token);
112
+ }
113
+ return [2 /*return*/, config];
121
114
  }
122
115
  });
123
116
  }); });
@@ -128,12 +121,15 @@ PHXAxiosInstance.interceptors.response.use(function (response) { return response
128
121
  switch (_b.label) {
129
122
  case 0:
130
123
  originalRequest = error.config;
131
- if (!(((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === 401 && !originalRequest._retry)) return [3 /*break*/, 4];
124
+ if (!(((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === 401 && !originalRequest._retry)) return [3 /*break*/, 5];
132
125
  originalRequest._retry = true;
126
+ if (!refreshPromise) {
127
+ refreshPromise = refreshAccessToken();
128
+ }
133
129
  _b.label = 1;
134
130
  case 1:
135
- _b.trys.push([1, 3, , 4]);
136
- return [4 /*yield*/, refreshAccessToken()];
131
+ _b.trys.push([1, 3, 4, 5]);
132
+ return [4 /*yield*/, refreshPromise];
137
133
  case 2:
138
134
  newToken = _b.sent();
139
135
  originalRequest.headers.Authorization = "Bearer ".concat(newToken);
@@ -141,7 +137,10 @@ PHXAxiosInstance.interceptors.response.use(function (response) { return response
141
137
  case 3:
142
138
  err_3 = _b.sent();
143
139
  return [2 /*return*/, Promise.reject(err_3)];
144
- case 4: return [2 /*return*/, Promise.reject(error)];
140
+ case 4:
141
+ refreshPromise = null;
142
+ return [7 /*endfinally*/];
143
+ case 5: return [2 /*return*/, Promise.reject(error)];
145
144
  }
146
145
  });
147
146
  }); });
@@ -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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"}
@@ -7,7 +7,7 @@ import PHXFuncGetCookieSession from './components/Func/getCookieSession';
7
7
  import { cookies as serverCookies, headers as serverHeaders } from 'next/headers';
8
8
  var isServer = typeof window === 'undefined';
9
9
  var publicUrl = getEnv('NEXT_PUBLIC_API_GATEWAY', process.env.NEXT_PUBLIC_API_GATEWAY);
10
- var internalUrl = getEnv('NEXT_PUBLIC_API_GATEWAY_INTERNAL', process.env.NEXT_PUBLIC_API_GATEWAY_INTERNAL);
10
+ // const internalUrl = getEnv('NEXT_PUBLIC_API_GATEWAY_INTERNAL', process.env.NEXT_PUBLIC_API_GATEWAY_INTERNAL)
11
11
  // Dùng promise singleton để các request cùng chờ 1 lần refresh
12
12
  var refreshPromise = null;
13
13
  var PHXAxiosInstance = axios.create({
@@ -84,36 +84,29 @@ var refreshAccessToken = function () { return __awaiter(void 0, void 0, void 0,
84
84
  });
85
85
  }); };
86
86
  PHXAxiosInstance.interceptors.request.use(function (config) { return __awaiter(void 0, void 0, void 0, function () {
87
- var currentSession, authToken, err_2, newToken;
88
- var _a;
89
- return __generator(this, function (_b) {
90
- switch (_b.label) {
87
+ var currentSession, token, err_2;
88
+ return __generator(this, function (_a) {
89
+ switch (_a.label) {
91
90
  case 0:
92
91
  currentSession = PHXFuncGetCookieSession();
93
- authToken = currentSession === null || currentSession === void 0 ? void 0 : currentSession.access_token;
94
- if (!authToken) return [3 /*break*/, 7];
95
- config.headers.Authorization = "Bearer ".concat(authToken);
96
- if (!isServer) return [3 /*break*/, 7];
97
- _b.label = 1;
92
+ token = (currentSession === null || currentSession === void 0 ? void 0 : currentSession.access_token) || null;
93
+ if (!refreshPromise) return [3 /*break*/, 4];
94
+ _a.label = 1;
98
95
  case 1:
99
- _b.trys.push([1, 3, , 7]);
100
- return [4 /*yield*/, axios.post("".concat(internalUrl, "/authen/authenticate"), {}, {
101
- headers: __assign({ Authorization: "Bearer ".concat(authToken) }, getAuthHeaders())
102
- })];
96
+ _a.trys.push([1, 3, , 4]);
97
+ return [4 /*yield*/, refreshPromise];
103
98
  case 2:
104
- _b.sent();
105
- return [3 /*break*/, 7];
99
+ token = _a.sent();
100
+ return [3 /*break*/, 4];
106
101
  case 3:
107
- err_2 = _b.sent();
108
- if (!(((_a = err_2.response) === null || _a === void 0 ? void 0 : _a.status) === 401)) return [3 /*break*/, 5];
109
- return [4 /*yield*/, refreshAccessToken()];
102
+ err_2 = _a.sent();
103
+ console.warn('Token refresh failed in request');
104
+ return [3 /*break*/, 4];
110
105
  case 4:
111
- newToken = _b.sent();
112
- config.headers.Authorization = "Bearer ".concat(newToken);
113
- return [3 /*break*/, 6];
114
- case 5: throw err_2;
115
- case 6: return [3 /*break*/, 7];
116
- case 7: return [2 /*return*/, config];
106
+ if (token) {
107
+ config.headers.Authorization = "Bearer ".concat(token);
108
+ }
109
+ return [2 /*return*/, config];
117
110
  }
118
111
  });
119
112
  }); });
@@ -124,12 +117,15 @@ PHXAxiosInstance.interceptors.response.use(function (response) { return response
124
117
  switch (_b.label) {
125
118
  case 0:
126
119
  originalRequest = error.config;
127
- if (!(((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === 401 && !originalRequest._retry)) return [3 /*break*/, 4];
120
+ if (!(((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === 401 && !originalRequest._retry)) return [3 /*break*/, 5];
128
121
  originalRequest._retry = true;
122
+ if (!refreshPromise) {
123
+ refreshPromise = refreshAccessToken();
124
+ }
129
125
  _b.label = 1;
130
126
  case 1:
131
- _b.trys.push([1, 3, , 4]);
132
- return [4 /*yield*/, refreshAccessToken()];
127
+ _b.trys.push([1, 3, 4, 5]);
128
+ return [4 /*yield*/, refreshPromise];
133
129
  case 2:
134
130
  newToken = _b.sent();
135
131
  originalRequest.headers.Authorization = "Bearer ".concat(newToken);
@@ -137,7 +133,10 @@ PHXAxiosInstance.interceptors.response.use(function (response) { return response
137
133
  case 3:
138
134
  err_3 = _b.sent();
139
135
  return [2 /*return*/, Promise.reject(err_3)];
140
- case 4: return [2 /*return*/, Promise.reject(error)];
136
+ case 4:
137
+ refreshPromise = null;
138
+ return [7 /*endfinally*/];
139
+ case 5: return [2 /*return*/, Promise.reject(error)];
141
140
  }
142
141
  });
143
142
  }); });
@@ -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.215",
3
+ "version": "1.0.216",
4
4
  "description": "PHX REACT",
5
5
  "main": "./dist/cjs/index.js",
6
6
  "module": "./dist/esm/index.js",