phx-uikit 1.0.218 → 1.0.220

package/dist/cjs/axiosInstance.js

@@ -3,15 +3,16 @@ exports.__esModule = true;
 exports.PHXAxiosInstance = void 0;
 var tslib_1 = require("tslib");
 var axios_1 = tslib_1.__importDefault(require("axios"));
+var async_lock_1 = tslib_1.__importDefault(require("async-lock"));
 var read_env_config_1 = require("./read-env-config");
 var constants_1 = require("./utils/constants");
 var saveCookiesClient_1 = tslib_1.__importDefault(require("./components/Func/saveCookiesClient"));
 var getCookieSession_1 = tslib_1.__importDefault(require("./components/Func/getCookieSession"));
 var headers_1 = require("next/headers");
-var isServer = typeof window === 'undefined';
+var lock = new async_lock_1["default"]();
 var publicUrl = (0, read_env_config_1.getEnv)('NEXT_PUBLIC_API_GATEWAY', process.env.NEXT_PUBLIC_API_GATEWAY);
-// const internalUrl = getEnv('NEXT_PUBLIC_API_GATEWAY_INTERNAL', process.env.NEXT_PUBLIC_API_GATEWAY_INTERNAL)
-var refreshPromise = null;
+var internalUrl = (0, read_env_config_1.getEnv)('NEXT_PUBLIC_API_GATEWAY_INTERNAL', process.env.NEXT_PUBLIC_API_GATEWAY_INTERNAL);
+var isServer = typeof window === 'undefined';
 var PHXAxiosInstance = axios_1["default"].create({
     baseURL: publicUrl
 });
@@ -48,70 +49,72 @@ var saveRefreshTokenServer = function (response) {
 };
 var refreshAccessToken = function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
     return tslib_1.__generator(this, function (_a) {
-        if (!refreshPromise) {
-            console.log('[REFRESH] 🔁 Bắt đầu refresh token');
-            refreshPromise = (function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-                var response, newToken, currentSession, err_1;
+        return [2 /*return*/, lock.acquire('refresh_token', function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+                var currentSession, currentToken, response, newToken, updatedSession, err_1;
                 return tslib_1.__generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
-                            _a.trys.push([0, 2, 3, 4]);
-                            return [4 /*yield*/, axios_1["default"].post("".concat(isServer ? (0, headers_1.headers)().get('origin') : '', "/api/authenticate/refresh-token"), {}, {
-                                    headers: getAuthHeaders()
-                                })];
+                            currentSession = (0, getCookieSession_1["default"])();
+                            currentToken = currentSession === null || currentSession === void 0 ? void 0 : currentSession.access_token;
+                            // Nếu access token vẫn còn, không cần gọi lại nữa
+                            if (currentToken) {
+                                return [2 /*return*/, currentToken];
+                            }
+                            _a.label = 1;
                         case 1:
+                            _a.trys.push([1, 3, , 4]);
+                            return [4 /*yield*/, axios_1["default"].post("".concat(isServer ? (0, headers_1.headers)().get('origin') : '', "/api/authenticate/refresh-token"), {}, { headers: getAuthHeaders() })];
+                        case 2:
                             response = _a.sent();
                             newToken = response.data.token;
-                            currentSession = (0, getCookieSession_1["default"])();
-                            (0, saveCookiesClient_1["default"])({ value: tslib_1.__assign(tslib_1.__assign({}, currentSession), { access_token: newToken }) });
-                            if (isServer) {
+                            updatedSession = (0, getCookieSession_1["default"])();
+                            (0, saveCookiesClient_1["default"])({ value: tslib_1.__assign(tslib_1.__assign({}, updatedSession), { access_token: newToken }) });
+                            if (isServer)
                                 saveRefreshTokenServer(response);
-                            }
                             return [2 /*return*/, newToken];
-                        case 2:
+                        case 3:
                             err_1 = _a.sent();
                             if (!isServer) {
-                                // Cookies.remove(COOKIE_SESSION_SIGN_IN)
                                 window.location.href = constants_1.loginPage;
                             }
                             throw err_1;
-                        case 3:
-                            refreshPromise = null;
-                            console.log('[REFRESH] ✅ Done');
-                            return [7 /*endfinally*/];
                         case 4: return [2 /*return*/];
                     }
                 });
-            }); })();
-        }
-        return [2 /*return*/, refreshPromise];
+            }); })];
     });
 }); };
 PHXAxiosInstance.interceptors.request.use(function (config) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-    var token, err_2;
+    var currentSession, authTokenCookie, err_2, newToken;
     var _a;
     return tslib_1.__generator(this, function (_b) {
         switch (_b.label) {
             case 0:
-                token = ((_a = (0, getCookieSession_1["default"])()) === null || _a === void 0 ? void 0 : _a.access_token) || null;
-                if (!refreshPromise) return [3 /*break*/, 4];
+                currentSession = (0, getCookieSession_1["default"])();
+                authTokenCookie = (currentSession === null || currentSession === void 0 ? void 0 : currentSession.access_token) || null;
+                if (!authTokenCookie) return [3 /*break*/, 7];
+                config.headers.Authorization = "Bearer ".concat(authTokenCookie);
+                if (!isServer) return [3 /*break*/, 7];
                 _b.label = 1;
             case 1:
-                _b.trys.push([1, 3, , 4]);
-                console.log('[REQUEST] 🕒 Chờ token refresh xong...');
-                return [4 /*yield*/, refreshPromise];
+                _b.trys.push([1, 3, , 7]);
+                return [4 /*yield*/, axios_1["default"].post("".concat(internalUrl, "/authen/authenticate"), {}, {
+                        headers: tslib_1.__assign({ Authorization: "Bearer ".concat(authTokenCookie) }, getAuthHeaders())
+                    })];
             case 2:
-                token = _b.sent();
-                return [3 /*break*/, 4];
+                _b.sent();
+                return [3 /*break*/, 7];
             case 3:
                 err_2 = _b.sent();
-                console.warn('[REQUEST] ❌ Refresh thất bại khi đang đợi');
-                return [3 /*break*/, 4];
+                if (!(((_a = err_2.response) === null || _a === void 0 ? void 0 : _a.status) === 401)) return [3 /*break*/, 5];
+                return [4 /*yield*/, refreshAccessToken()];
             case 4:
-                if (token) {
-                    config.headers.Authorization = "Bearer ".concat(token);
-                }
-                return [2 /*return*/, config];
+                newToken = _b.sent();
+                config.headers.Authorization = "Bearer ".concat(newToken);
+                return [3 /*break*/, 6];
+            case 5: throw err_2;
+            case 6: return [3 /*break*/, 7];
+            case 7: return [2 /*return*/, config];
         }
     });
 }); });

package/dist/cjs/axiosInstance.js.map

@@ -1 +1 @@
-{"version":3,"file":"axiosInstance.js","sourceRoot":"","sources":["../../src/axiosInstance.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"axiosInstance.js","sourceRoot":"","sources":["../../src/axiosInstance.ts"],"names":[],"mappings":"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"}

package/dist/esm/axiosInstance.js

@@ -1,20 +1,21 @@
 import { __assign, __awaiter, __generator } from "tslib";
 import axios from 'axios';
+import AsyncLock from 'async-lock';
 import { getEnv } from './read-env-config';
 import { COOKIE_REFRESH_TOKEN, loginPage } from './utils/constants';
 import saveCookiesClient from './components/Func/saveCookiesClient';
 import PHXFuncGetCookieSession from './components/Func/getCookieSession';
-import { cookies as serverCookies, headers as serverHeaders } from 'next/headers';
-var isServer = typeof window === 'undefined';
+import { cookies, headers } from 'next/headers';
+var lock = new AsyncLock();
 var publicUrl = getEnv('NEXT_PUBLIC_API_GATEWAY', process.env.NEXT_PUBLIC_API_GATEWAY);
-// const internalUrl = getEnv('NEXT_PUBLIC_API_GATEWAY_INTERNAL', process.env.NEXT_PUBLIC_API_GATEWAY_INTERNAL)
-var refreshPromise = null;
+var internalUrl = getEnv('NEXT_PUBLIC_API_GATEWAY_INTERNAL', process.env.NEXT_PUBLIC_API_GATEWAY_INTERNAL);
+var isServer = typeof window === 'undefined';
 var PHXAxiosInstance = axios.create({
     baseURL: publicUrl
 });
 var getAuthHeaders = function () {
     if (isServer) {
-        var cookieStore = serverCookies();
+        var cookieStore = cookies();
         var cookieHeader = cookieStore
             .getAll()
             .map(function (_a) {
@@ -24,7 +25,7 @@ var getAuthHeaders = function () {
             .join('; ');
         return {
             Cookie: cookieHeader,
-            hostname: serverHeaders().get('origin')
+            hostname: headers().get('origin')
         };
     }
     return {};
@@ -34,7 +35,7 @@ var saveRefreshTokenServer = function (response) {
     var setCookieHeader = ((_a = response.headers['set-cookie']) === null || _a === void 0 ? void 0 : _a[0]) || '';
     var match = setCookieHeader.match(/refresh_token=([^;]+)/);
     var refreshToken = (match === null || match === void 0 ? void 0 : match[1]) || '';
-    serverCookies().set(COOKIE_REFRESH_TOKEN, refreshToken, {
+    cookies().set(COOKIE_REFRESH_TOKEN, refreshToken, {
         path: '/',
         httpOnly: true,
         secure: true,
@@ -44,70 +45,72 @@ var saveRefreshTokenServer = function (response) {
 };
 var refreshAccessToken = function () { return __awaiter(void 0, void 0, void 0, function () {
     return __generator(this, function (_a) {
-        if (!refreshPromise) {
-            console.log('[REFRESH] 🔁 Bắt đầu refresh token');
-            refreshPromise = (function () { return __awaiter(void 0, void 0, void 0, function () {
-                var response, newToken, currentSession, err_1;
+        return [2 /*return*/, lock.acquire('refresh_token', function () { return __awaiter(void 0, void 0, void 0, function () {
+                var currentSession, currentToken, response, newToken, updatedSession, err_1;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
-                            _a.trys.push([0, 2, 3, 4]);
-                            return [4 /*yield*/, axios.post("".concat(isServer ? serverHeaders().get('origin') : '', "/api/authenticate/refresh-token"), {}, {
-                                    headers: getAuthHeaders()
-                                })];
+                            currentSession = PHXFuncGetCookieSession();
+                            currentToken = currentSession === null || currentSession === void 0 ? void 0 : currentSession.access_token;
+                            // Nếu access token vẫn còn, không cần gọi lại nữa
+                            if (currentToken) {
+                                return [2 /*return*/, currentToken];
+                            }
+                            _a.label = 1;
                         case 1:
+                            _a.trys.push([1, 3, , 4]);
+                            return [4 /*yield*/, axios.post("".concat(isServer ? headers().get('origin') : '', "/api/authenticate/refresh-token"), {}, { headers: getAuthHeaders() })];
+                        case 2:
                             response = _a.sent();
                             newToken = response.data.token;
-                            currentSession = PHXFuncGetCookieSession();
-                            saveCookiesClient({ value: __assign(__assign({}, currentSession), { access_token: newToken }) });
-                            if (isServer) {
+                            updatedSession = PHXFuncGetCookieSession();
+                            saveCookiesClient({ value: __assign(__assign({}, updatedSession), { access_token: newToken }) });
+                            if (isServer)
                                 saveRefreshTokenServer(response);
-                            }
                             return [2 /*return*/, newToken];
-                        case 2:
+                        case 3:
                             err_1 = _a.sent();
                             if (!isServer) {
-                                // Cookies.remove(COOKIE_SESSION_SIGN_IN)
                                 window.location.href = loginPage;
                             }
                             throw err_1;
-                        case 3:
-                            refreshPromise = null;
-                            console.log('[REFRESH] ✅ Done');
-                            return [7 /*endfinally*/];
                         case 4: return [2 /*return*/];
                     }
                 });
-            }); })();
-        }
-        return [2 /*return*/, refreshPromise];
+            }); })];
     });
 }); };
 PHXAxiosInstance.interceptors.request.use(function (config) { return __awaiter(void 0, void 0, void 0, function () {
-    var token, err_2;
+    var currentSession, authTokenCookie, err_2, newToken;
     var _a;
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
-                token = ((_a = PHXFuncGetCookieSession()) === null || _a === void 0 ? void 0 : _a.access_token) || null;
-                if (!refreshPromise) return [3 /*break*/, 4];
+                currentSession = PHXFuncGetCookieSession();
+                authTokenCookie = (currentSession === null || currentSession === void 0 ? void 0 : currentSession.access_token) || null;
+                if (!authTokenCookie) return [3 /*break*/, 7];
+                config.headers.Authorization = "Bearer ".concat(authTokenCookie);
+                if (!isServer) return [3 /*break*/, 7];
                 _b.label = 1;
             case 1:
-                _b.trys.push([1, 3, , 4]);
-                console.log('[REQUEST] 🕒 Chờ token refresh xong...');
-                return [4 /*yield*/, refreshPromise];
+                _b.trys.push([1, 3, , 7]);
+                return [4 /*yield*/, axios.post("".concat(internalUrl, "/authen/authenticate"), {}, {
+                        headers: __assign({ Authorization: "Bearer ".concat(authTokenCookie) }, getAuthHeaders())
+                    })];
             case 2:
-                token = _b.sent();
-                return [3 /*break*/, 4];
+                _b.sent();
+                return [3 /*break*/, 7];
             case 3:
                 err_2 = _b.sent();
-                console.warn('[REQUEST] ❌ Refresh thất bại khi đang đợi');
-                return [3 /*break*/, 4];
+                if (!(((_a = err_2.response) === null || _a === void 0 ? void 0 : _a.status) === 401)) return [3 /*break*/, 5];
+                return [4 /*yield*/, refreshAccessToken()];
             case 4:
-                if (token) {
-                    config.headers.Authorization = "Bearer ".concat(token);
-                }
-                return [2 /*return*/, config];
+                newToken = _b.sent();
+                config.headers.Authorization = "Bearer ".concat(newToken);
+                return [3 /*break*/, 6];
+            case 5: throw err_2;
+            case 6: return [3 /*break*/, 7];
+            case 7: return [2 /*return*/, config];
         }
     });
 }); });

package/dist/esm/axiosInstance.js.map

@@ -1 +1 @@
-{"version":3,"file":"axiosInstance.js","sourceRoot":"","sources":["../../src/axiosInstance.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"axiosInstance.js","sourceRoot":"","sources":["../../src/axiosInstance.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phx-uikit",
-  "version": "1.0.218",
+  "version": "1.0.220",
   "description": "PHX REACT",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",
@@ -55,6 +55,7 @@
     "@storybook/testing-library": "^0.0.14-next.2",
     "@tailwindcss/forms": "^0.5.3",
     "@testing-library/react": "^15.0.6",
+    "@types/async-lock": "^1.4.2",
     "@types/crypto-js": "^4.2.2",
     "@types/jest": "^29.5.11",
     "@types/js-cookie": "^3.0.3",
@@ -95,6 +96,7 @@
     ]
   },
   "dependencies": {
+    "async-lock": "^1.4.1",
     "axios": "^1.5.0",
     "crypto-js": "^4.2.0",
     "date-fns": "^2.30.0",