phx-uikit 1.0.217 → 1.0.218
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.
|
@@ -8,30 +8,16 @@ var constants_1 = require("./utils/constants");
|
|
|
8
8
|
var saveCookiesClient_1 = tslib_1.__importDefault(require("./components/Func/saveCookiesClient"));
|
|
9
9
|
var getCookieSession_1 = tslib_1.__importDefault(require("./components/Func/getCookieSession"));
|
|
10
10
|
var headers_1 = require("next/headers");
|
|
11
|
-
var isRefreshing = false;
|
|
12
|
-
var failedQueue = [];
|
|
13
|
-
var publicUrl = (0, read_env_config_1.getEnv)('NEXT_PUBLIC_API_GATEWAY', process.env.NEXT_PUBLIC_API_GATEWAY);
|
|
14
|
-
var internalUrl = (0, read_env_config_1.getEnv)('NEXT_PUBLIC_API_GATEWAY_INTERNAL', process.env.NEXT_PUBLIC_API_GATEWAY_INTERNAL);
|
|
15
11
|
var isServer = typeof window === 'undefined';
|
|
16
|
-
var
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
if (error) {
|
|
20
|
-
prom.reject(error);
|
|
21
|
-
}
|
|
22
|
-
else {
|
|
23
|
-
prom.resolve(token);
|
|
24
|
-
}
|
|
25
|
-
});
|
|
26
|
-
failedQueue = [];
|
|
27
|
-
};
|
|
12
|
+
var publicUrl = (0, read_env_config_1.getEnv)('NEXT_PUBLIC_API_GATEWAY', process.env.NEXT_PUBLIC_API_GATEWAY);
|
|
13
|
+
// const internalUrl = getEnv('NEXT_PUBLIC_API_GATEWAY_INTERNAL', process.env.NEXT_PUBLIC_API_GATEWAY_INTERNAL)
|
|
14
|
+
var refreshPromise = null;
|
|
28
15
|
var PHXAxiosInstance = axios_1["default"].create({
|
|
29
16
|
baseURL: publicUrl
|
|
30
17
|
});
|
|
31
18
|
exports.PHXAxiosInstance = PHXAxiosInstance;
|
|
32
19
|
var getAuthHeaders = function () {
|
|
33
20
|
if (isServer) {
|
|
34
|
-
// Server-side
|
|
35
21
|
var cookieStore = (0, headers_1.cookies)();
|
|
36
22
|
var cookieHeader = cookieStore
|
|
37
23
|
.getAll()
|
|
@@ -47,36 +33,6 @@ var getAuthHeaders = function () {
|
|
|
47
33
|
}
|
|
48
34
|
return {};
|
|
49
35
|
};
|
|
50
|
-
var refreshAccessToken = function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
51
|
-
var response, newToken, currentSession, err_1;
|
|
52
|
-
return tslib_1.__generator(this, function (_a) {
|
|
53
|
-
switch (_a.label) {
|
|
54
|
-
case 0:
|
|
55
|
-
_a.trys.push([0, 2, , 3]);
|
|
56
|
-
return [4 /*yield*/, axios_1["default"].post("".concat(isServer ? (0, headers_1.headers)().get('origin') : '', "/api/authenticate/refresh-token"), {}, {
|
|
57
|
-
headers: getAuthHeaders()
|
|
58
|
-
})];
|
|
59
|
-
case 1:
|
|
60
|
-
response = _a.sent();
|
|
61
|
-
newToken = response.data.token;
|
|
62
|
-
currentSession = (0, getCookieSession_1["default"])();
|
|
63
|
-
(0, saveCookiesClient_1["default"])({ value: tslib_1.__assign(tslib_1.__assign({}, currentSession), { access_token: newToken }) });
|
|
64
|
-
if (isServer) {
|
|
65
|
-
// save refresh token from server site
|
|
66
|
-
saveRefreshTokenServer(response);
|
|
67
|
-
}
|
|
68
|
-
return [2 /*return*/, newToken];
|
|
69
|
-
case 2:
|
|
70
|
-
err_1 = _a.sent();
|
|
71
|
-
if (!isServer) {
|
|
72
|
-
// Cookies.remove(COOKIE_SESSION_SIGN_IN)
|
|
73
|
-
window.location.href = constants_1.loginPage;
|
|
74
|
-
}
|
|
75
|
-
throw err_1;
|
|
76
|
-
case 3: return [2 /*return*/];
|
|
77
|
-
}
|
|
78
|
-
});
|
|
79
|
-
}); };
|
|
80
36
|
var saveRefreshTokenServer = function (response) {
|
|
81
37
|
var _a;
|
|
82
38
|
var setCookieHeader = ((_a = response.headers['set-cookie']) === null || _a === void 0 ? void 0 : _a[0]) || '';
|
|
@@ -90,37 +46,72 @@ var saveRefreshTokenServer = function (response) {
|
|
|
90
46
|
expires: new Date(Date.now() + 365 * 24 * 60 * 60 * 1000)
|
|
91
47
|
});
|
|
92
48
|
};
|
|
49
|
+
var refreshAccessToken = function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
50
|
+
return tslib_1.__generator(this, function (_a) {
|
|
51
|
+
if (!refreshPromise) {
|
|
52
|
+
console.log('[REFRESH] 🔁 Bắt đầu refresh token');
|
|
53
|
+
refreshPromise = (function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
54
|
+
var response, newToken, currentSession, err_1;
|
|
55
|
+
return tslib_1.__generator(this, function (_a) {
|
|
56
|
+
switch (_a.label) {
|
|
57
|
+
case 0:
|
|
58
|
+
_a.trys.push([0, 2, 3, 4]);
|
|
59
|
+
return [4 /*yield*/, axios_1["default"].post("".concat(isServer ? (0, headers_1.headers)().get('origin') : '', "/api/authenticate/refresh-token"), {}, {
|
|
60
|
+
headers: getAuthHeaders()
|
|
61
|
+
})];
|
|
62
|
+
case 1:
|
|
63
|
+
response = _a.sent();
|
|
64
|
+
newToken = response.data.token;
|
|
65
|
+
currentSession = (0, getCookieSession_1["default"])();
|
|
66
|
+
(0, saveCookiesClient_1["default"])({ value: tslib_1.__assign(tslib_1.__assign({}, currentSession), { access_token: newToken }) });
|
|
67
|
+
if (isServer) {
|
|
68
|
+
saveRefreshTokenServer(response);
|
|
69
|
+
}
|
|
70
|
+
return [2 /*return*/, newToken];
|
|
71
|
+
case 2:
|
|
72
|
+
err_1 = _a.sent();
|
|
73
|
+
if (!isServer) {
|
|
74
|
+
// Cookies.remove(COOKIE_SESSION_SIGN_IN)
|
|
75
|
+
window.location.href = constants_1.loginPage;
|
|
76
|
+
}
|
|
77
|
+
throw err_1;
|
|
78
|
+
case 3:
|
|
79
|
+
refreshPromise = null;
|
|
80
|
+
console.log('[REFRESH] ✅ Done');
|
|
81
|
+
return [7 /*endfinally*/];
|
|
82
|
+
case 4: return [2 /*return*/];
|
|
83
|
+
}
|
|
84
|
+
});
|
|
85
|
+
}); })();
|
|
86
|
+
}
|
|
87
|
+
return [2 /*return*/, refreshPromise];
|
|
88
|
+
});
|
|
89
|
+
}); };
|
|
93
90
|
PHXAxiosInstance.interceptors.request.use(function (config) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
94
|
-
var
|
|
91
|
+
var token, err_2;
|
|
95
92
|
var _a;
|
|
96
93
|
return tslib_1.__generator(this, function (_b) {
|
|
97
94
|
switch (_b.label) {
|
|
98
95
|
case 0:
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
if (!authTokenCookie) return [3 /*break*/, 7];
|
|
102
|
-
config.headers.Authorization = "Bearer ".concat(authTokenCookie);
|
|
103
|
-
if (!isServer) return [3 /*break*/, 7];
|
|
96
|
+
token = ((_a = (0, getCookieSession_1["default"])()) === null || _a === void 0 ? void 0 : _a.access_token) || null;
|
|
97
|
+
if (!refreshPromise) return [3 /*break*/, 4];
|
|
104
98
|
_b.label = 1;
|
|
105
99
|
case 1:
|
|
106
|
-
_b.trys.push([1, 3, ,
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
})];
|
|
100
|
+
_b.trys.push([1, 3, , 4]);
|
|
101
|
+
console.log('[REQUEST] 🕒 Chờ token refresh xong...');
|
|
102
|
+
return [4 /*yield*/, refreshPromise];
|
|
110
103
|
case 2:
|
|
111
|
-
_b.sent();
|
|
112
|
-
return [3 /*break*/,
|
|
104
|
+
token = _b.sent();
|
|
105
|
+
return [3 /*break*/, 4];
|
|
113
106
|
case 3:
|
|
114
107
|
err_2 = _b.sent();
|
|
115
|
-
|
|
116
|
-
return [
|
|
108
|
+
console.warn('[REQUEST] ❌ Refresh thất bại khi đang đợi');
|
|
109
|
+
return [3 /*break*/, 4];
|
|
117
110
|
case 4:
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
case 6: return [3 /*break*/, 7];
|
|
123
|
-
case 7: return [2 /*return*/, config];
|
|
111
|
+
if (token) {
|
|
112
|
+
config.headers.Authorization = "Bearer ".concat(token);
|
|
113
|
+
}
|
|
114
|
+
return [2 /*return*/, config];
|
|
124
115
|
}
|
|
125
116
|
});
|
|
126
117
|
}); });
|
|
@@ -131,37 +122,20 @@ PHXAxiosInstance.interceptors.response.use(function (response) { return response
|
|
|
131
122
|
switch (_b.label) {
|
|
132
123
|
case 0:
|
|
133
124
|
originalRequest = error.config;
|
|
134
|
-
if (!(((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === 401 && !originalRequest._retry)) return [3 /*break*/,
|
|
135
|
-
if (isRefreshing) {
|
|
136
|
-
return [2 /*return*/, new Promise(function (resolve, reject) {
|
|
137
|
-
failedQueue.push({
|
|
138
|
-
resolve: function (token) {
|
|
139
|
-
originalRequest.headers.Authorization = 'Bearer ' + token;
|
|
140
|
-
resolve(PHXAxiosInstance(originalRequest));
|
|
141
|
-
},
|
|
142
|
-
reject: function (err) { return reject(err); }
|
|
143
|
-
});
|
|
144
|
-
})];
|
|
145
|
-
}
|
|
125
|
+
if (!(((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === 401 && !originalRequest._retry)) return [3 /*break*/, 4];
|
|
146
126
|
originalRequest._retry = true;
|
|
147
|
-
isRefreshing = true;
|
|
148
127
|
_b.label = 1;
|
|
149
128
|
case 1:
|
|
150
|
-
_b.trys.push([1, 3,
|
|
129
|
+
_b.trys.push([1, 3, , 4]);
|
|
151
130
|
return [4 /*yield*/, refreshAccessToken()];
|
|
152
131
|
case 2:
|
|
153
132
|
newToken = _b.sent();
|
|
154
|
-
processQueue(null, newToken);
|
|
155
133
|
originalRequest.headers.Authorization = "Bearer ".concat(newToken);
|
|
156
134
|
return [2 /*return*/, PHXAxiosInstance(originalRequest)];
|
|
157
135
|
case 3:
|
|
158
136
|
err_3 = _b.sent();
|
|
159
|
-
processQueue(err_3, null);
|
|
160
137
|
return [2 /*return*/, Promise.reject(err_3)];
|
|
161
|
-
case 4:
|
|
162
|
-
isRefreshing = false;
|
|
163
|
-
return [7 /*endfinally*/];
|
|
164
|
-
case 5: return [2 /*return*/, Promise.reject(error)];
|
|
138
|
+
case 4: return [2 /*return*/, Promise.reject(error)];
|
|
165
139
|
}
|
|
166
140
|
});
|
|
167
141
|
}); });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"axiosInstance.js","sourceRoot":"","sources":["../../src/axiosInstance.ts"],"names":[],"mappings":";;;;AAAA,wDAAyB;AACzB,qDAA0C;AAC1C,+CAAmE;AACnE,kGAAmE;AACnE,gGAAwE;AACxE,
|
|
1
|
+
{"version":3,"file":"axiosInstance.js","sourceRoot":"","sources":["../../src/axiosInstance.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,31 +4,17 @@ import { getEnv } from './read-env-config';
|
|
|
4
4
|
import { COOKIE_REFRESH_TOKEN, loginPage } from './utils/constants';
|
|
5
5
|
import saveCookiesClient from './components/Func/saveCookiesClient';
|
|
6
6
|
import PHXFuncGetCookieSession from './components/Func/getCookieSession';
|
|
7
|
-
import { cookies, headers } from 'next/headers';
|
|
8
|
-
var isRefreshing = false;
|
|
9
|
-
var failedQueue = [];
|
|
10
|
-
var publicUrl = getEnv('NEXT_PUBLIC_API_GATEWAY', process.env.NEXT_PUBLIC_API_GATEWAY);
|
|
11
|
-
var internalUrl = getEnv('NEXT_PUBLIC_API_GATEWAY_INTERNAL', process.env.NEXT_PUBLIC_API_GATEWAY_INTERNAL);
|
|
7
|
+
import { cookies as serverCookies, headers as serverHeaders } from 'next/headers';
|
|
12
8
|
var isServer = typeof window === 'undefined';
|
|
13
|
-
var
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
if (error) {
|
|
17
|
-
prom.reject(error);
|
|
18
|
-
}
|
|
19
|
-
else {
|
|
20
|
-
prom.resolve(token);
|
|
21
|
-
}
|
|
22
|
-
});
|
|
23
|
-
failedQueue = [];
|
|
24
|
-
};
|
|
9
|
+
var publicUrl = getEnv('NEXT_PUBLIC_API_GATEWAY', process.env.NEXT_PUBLIC_API_GATEWAY);
|
|
10
|
+
// const internalUrl = getEnv('NEXT_PUBLIC_API_GATEWAY_INTERNAL', process.env.NEXT_PUBLIC_API_GATEWAY_INTERNAL)
|
|
11
|
+
var refreshPromise = null;
|
|
25
12
|
var PHXAxiosInstance = axios.create({
|
|
26
13
|
baseURL: publicUrl
|
|
27
14
|
});
|
|
28
15
|
var getAuthHeaders = function () {
|
|
29
16
|
if (isServer) {
|
|
30
|
-
|
|
31
|
-
var cookieStore = cookies();
|
|
17
|
+
var cookieStore = serverCookies();
|
|
32
18
|
var cookieHeader = cookieStore
|
|
33
19
|
.getAll()
|
|
34
20
|
.map(function (_a) {
|
|
@@ -38,47 +24,17 @@ var getAuthHeaders = function () {
|
|
|
38
24
|
.join('; ');
|
|
39
25
|
return {
|
|
40
26
|
Cookie: cookieHeader,
|
|
41
|
-
hostname:
|
|
27
|
+
hostname: serverHeaders().get('origin')
|
|
42
28
|
};
|
|
43
29
|
}
|
|
44
30
|
return {};
|
|
45
31
|
};
|
|
46
|
-
var refreshAccessToken = function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
47
|
-
var response, newToken, currentSession, err_1;
|
|
48
|
-
return __generator(this, function (_a) {
|
|
49
|
-
switch (_a.label) {
|
|
50
|
-
case 0:
|
|
51
|
-
_a.trys.push([0, 2, , 3]);
|
|
52
|
-
return [4 /*yield*/, axios.post("".concat(isServer ? headers().get('origin') : '', "/api/authenticate/refresh-token"), {}, {
|
|
53
|
-
headers: getAuthHeaders()
|
|
54
|
-
})];
|
|
55
|
-
case 1:
|
|
56
|
-
response = _a.sent();
|
|
57
|
-
newToken = response.data.token;
|
|
58
|
-
currentSession = PHXFuncGetCookieSession();
|
|
59
|
-
saveCookiesClient({ value: __assign(__assign({}, currentSession), { access_token: newToken }) });
|
|
60
|
-
if (isServer) {
|
|
61
|
-
// save refresh token from server site
|
|
62
|
-
saveRefreshTokenServer(response);
|
|
63
|
-
}
|
|
64
|
-
return [2 /*return*/, newToken];
|
|
65
|
-
case 2:
|
|
66
|
-
err_1 = _a.sent();
|
|
67
|
-
if (!isServer) {
|
|
68
|
-
// Cookies.remove(COOKIE_SESSION_SIGN_IN)
|
|
69
|
-
window.location.href = loginPage;
|
|
70
|
-
}
|
|
71
|
-
throw err_1;
|
|
72
|
-
case 3: return [2 /*return*/];
|
|
73
|
-
}
|
|
74
|
-
});
|
|
75
|
-
}); };
|
|
76
32
|
var saveRefreshTokenServer = function (response) {
|
|
77
33
|
var _a;
|
|
78
34
|
var setCookieHeader = ((_a = response.headers['set-cookie']) === null || _a === void 0 ? void 0 : _a[0]) || '';
|
|
79
35
|
var match = setCookieHeader.match(/refresh_token=([^;]+)/);
|
|
80
36
|
var refreshToken = (match === null || match === void 0 ? void 0 : match[1]) || '';
|
|
81
|
-
|
|
37
|
+
serverCookies().set(COOKIE_REFRESH_TOKEN, refreshToken, {
|
|
82
38
|
path: '/',
|
|
83
39
|
httpOnly: true,
|
|
84
40
|
secure: true,
|
|
@@ -86,37 +42,72 @@ var saveRefreshTokenServer = function (response) {
|
|
|
86
42
|
expires: new Date(Date.now() + 365 * 24 * 60 * 60 * 1000)
|
|
87
43
|
});
|
|
88
44
|
};
|
|
45
|
+
var refreshAccessToken = function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
46
|
+
return __generator(this, function (_a) {
|
|
47
|
+
if (!refreshPromise) {
|
|
48
|
+
console.log('[REFRESH] 🔁 Bắt đầu refresh token');
|
|
49
|
+
refreshPromise = (function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
50
|
+
var response, newToken, currentSession, err_1;
|
|
51
|
+
return __generator(this, function (_a) {
|
|
52
|
+
switch (_a.label) {
|
|
53
|
+
case 0:
|
|
54
|
+
_a.trys.push([0, 2, 3, 4]);
|
|
55
|
+
return [4 /*yield*/, axios.post("".concat(isServer ? serverHeaders().get('origin') : '', "/api/authenticate/refresh-token"), {}, {
|
|
56
|
+
headers: getAuthHeaders()
|
|
57
|
+
})];
|
|
58
|
+
case 1:
|
|
59
|
+
response = _a.sent();
|
|
60
|
+
newToken = response.data.token;
|
|
61
|
+
currentSession = PHXFuncGetCookieSession();
|
|
62
|
+
saveCookiesClient({ value: __assign(__assign({}, currentSession), { access_token: newToken }) });
|
|
63
|
+
if (isServer) {
|
|
64
|
+
saveRefreshTokenServer(response);
|
|
65
|
+
}
|
|
66
|
+
return [2 /*return*/, newToken];
|
|
67
|
+
case 2:
|
|
68
|
+
err_1 = _a.sent();
|
|
69
|
+
if (!isServer) {
|
|
70
|
+
// Cookies.remove(COOKIE_SESSION_SIGN_IN)
|
|
71
|
+
window.location.href = loginPage;
|
|
72
|
+
}
|
|
73
|
+
throw err_1;
|
|
74
|
+
case 3:
|
|
75
|
+
refreshPromise = null;
|
|
76
|
+
console.log('[REFRESH] ✅ Done');
|
|
77
|
+
return [7 /*endfinally*/];
|
|
78
|
+
case 4: return [2 /*return*/];
|
|
79
|
+
}
|
|
80
|
+
});
|
|
81
|
+
}); })();
|
|
82
|
+
}
|
|
83
|
+
return [2 /*return*/, refreshPromise];
|
|
84
|
+
});
|
|
85
|
+
}); };
|
|
89
86
|
PHXAxiosInstance.interceptors.request.use(function (config) { return __awaiter(void 0, void 0, void 0, function () {
|
|
90
|
-
var
|
|
87
|
+
var token, err_2;
|
|
91
88
|
var _a;
|
|
92
89
|
return __generator(this, function (_b) {
|
|
93
90
|
switch (_b.label) {
|
|
94
91
|
case 0:
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
if (!authTokenCookie) return [3 /*break*/, 7];
|
|
98
|
-
config.headers.Authorization = "Bearer ".concat(authTokenCookie);
|
|
99
|
-
if (!isServer) return [3 /*break*/, 7];
|
|
92
|
+
token = ((_a = PHXFuncGetCookieSession()) === null || _a === void 0 ? void 0 : _a.access_token) || null;
|
|
93
|
+
if (!refreshPromise) return [3 /*break*/, 4];
|
|
100
94
|
_b.label = 1;
|
|
101
95
|
case 1:
|
|
102
|
-
_b.trys.push([1, 3, ,
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
})];
|
|
96
|
+
_b.trys.push([1, 3, , 4]);
|
|
97
|
+
console.log('[REQUEST] 🕒 Chờ token refresh xong...');
|
|
98
|
+
return [4 /*yield*/, refreshPromise];
|
|
106
99
|
case 2:
|
|
107
|
-
_b.sent();
|
|
108
|
-
return [3 /*break*/,
|
|
100
|
+
token = _b.sent();
|
|
101
|
+
return [3 /*break*/, 4];
|
|
109
102
|
case 3:
|
|
110
103
|
err_2 = _b.sent();
|
|
111
|
-
|
|
112
|
-
return [
|
|
104
|
+
console.warn('[REQUEST] ❌ Refresh thất bại khi đang đợi');
|
|
105
|
+
return [3 /*break*/, 4];
|
|
113
106
|
case 4:
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
case 6: return [3 /*break*/, 7];
|
|
119
|
-
case 7: return [2 /*return*/, config];
|
|
107
|
+
if (token) {
|
|
108
|
+
config.headers.Authorization = "Bearer ".concat(token);
|
|
109
|
+
}
|
|
110
|
+
return [2 /*return*/, config];
|
|
120
111
|
}
|
|
121
112
|
});
|
|
122
113
|
}); });
|
|
@@ -127,37 +118,20 @@ PHXAxiosInstance.interceptors.response.use(function (response) { return response
|
|
|
127
118
|
switch (_b.label) {
|
|
128
119
|
case 0:
|
|
129
120
|
originalRequest = error.config;
|
|
130
|
-
if (!(((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === 401 && !originalRequest._retry)) return [3 /*break*/,
|
|
131
|
-
if (isRefreshing) {
|
|
132
|
-
return [2 /*return*/, new Promise(function (resolve, reject) {
|
|
133
|
-
failedQueue.push({
|
|
134
|
-
resolve: function (token) {
|
|
135
|
-
originalRequest.headers.Authorization = 'Bearer ' + token;
|
|
136
|
-
resolve(PHXAxiosInstance(originalRequest));
|
|
137
|
-
},
|
|
138
|
-
reject: function (err) { return reject(err); }
|
|
139
|
-
});
|
|
140
|
-
})];
|
|
141
|
-
}
|
|
121
|
+
if (!(((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === 401 && !originalRequest._retry)) return [3 /*break*/, 4];
|
|
142
122
|
originalRequest._retry = true;
|
|
143
|
-
isRefreshing = true;
|
|
144
123
|
_b.label = 1;
|
|
145
124
|
case 1:
|
|
146
|
-
_b.trys.push([1, 3,
|
|
125
|
+
_b.trys.push([1, 3, , 4]);
|
|
147
126
|
return [4 /*yield*/, refreshAccessToken()];
|
|
148
127
|
case 2:
|
|
149
128
|
newToken = _b.sent();
|
|
150
|
-
processQueue(null, newToken);
|
|
151
129
|
originalRequest.headers.Authorization = "Bearer ".concat(newToken);
|
|
152
130
|
return [2 /*return*/, PHXAxiosInstance(originalRequest)];
|
|
153
131
|
case 3:
|
|
154
132
|
err_3 = _b.sent();
|
|
155
|
-
processQueue(err_3, null);
|
|
156
133
|
return [2 /*return*/, Promise.reject(err_3)];
|
|
157
|
-
case 4:
|
|
158
|
-
isRefreshing = false;
|
|
159
|
-
return [7 /*endfinally*/];
|
|
160
|
-
case 5: return [2 /*return*/, Promise.reject(error)];
|
|
134
|
+
case 4: return [2 /*return*/, Promise.reject(error)];
|
|
161
135
|
}
|
|
162
136
|
});
|
|
163
137
|
}); });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"axiosInstance.js","sourceRoot":"","sources":["../../src/axiosInstance.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,oBAAoB,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AACnE,OAAO,iBAAiB,MAAM,qCAAqC,CAAA;AACnE,OAAO,uBAAuB,MAAM,oCAAoC,CAAA;AACxE,OAAO,EAAE,OAAO,
|
|
1
|
+
{"version":3,"file":"axiosInstance.js","sourceRoot":"","sources":["../../src/axiosInstance.ts"],"names":[],"mappings":"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"}
|