phx-uikit 1.0.214 → 1.0.215
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,17 @@ 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
|
|
12
|
-
var failedQueue = [];
|
|
11
|
+
var isServer = typeof window === 'undefined';
|
|
13
12
|
var publicUrl = (0, read_env_config_1.getEnv)('NEXT_PUBLIC_API_GATEWAY', process.env.NEXT_PUBLIC_API_GATEWAY);
|
|
14
13
|
var internalUrl = (0, read_env_config_1.getEnv)('NEXT_PUBLIC_API_GATEWAY_INTERNAL', process.env.NEXT_PUBLIC_API_GATEWAY_INTERNAL);
|
|
15
|
-
|
|
16
|
-
var
|
|
17
|
-
if (token === void 0) { token = null; }
|
|
18
|
-
failedQueue.forEach(function (prom) {
|
|
19
|
-
if (error) {
|
|
20
|
-
prom.reject(error);
|
|
21
|
-
}
|
|
22
|
-
else {
|
|
23
|
-
prom.resolve(token);
|
|
24
|
-
}
|
|
25
|
-
});
|
|
26
|
-
failedQueue = [];
|
|
27
|
-
};
|
|
14
|
+
// Dùng promise singleton để các request cùng chờ 1 lần refresh
|
|
15
|
+
var refreshPromise = null;
|
|
28
16
|
var PHXAxiosInstance = axios_1["default"].create({
|
|
29
17
|
baseURL: publicUrl
|
|
30
18
|
});
|
|
31
19
|
exports.PHXAxiosInstance = PHXAxiosInstance;
|
|
32
20
|
var getAuthHeaders = function () {
|
|
33
21
|
if (isServer) {
|
|
34
|
-
// Server-side
|
|
35
22
|
var cookieStore = (0, headers_1.cookies)();
|
|
36
23
|
var cookieHeader = cookieStore
|
|
37
24
|
.getAll()
|
|
@@ -47,36 +34,6 @@ var getAuthHeaders = function () {
|
|
|
47
34
|
}
|
|
48
35
|
return {};
|
|
49
36
|
};
|
|
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
37
|
var saveRefreshTokenServer = function (response) {
|
|
81
38
|
var _a;
|
|
82
39
|
var setCookieHeader = ((_a = response.headers['set-cookie']) === null || _a === void 0 ? void 0 : _a[0]) || '';
|
|
@@ -90,22 +47,62 @@ var saveRefreshTokenServer = function (response) {
|
|
|
90
47
|
expires: new Date(Date.now() + 365 * 24 * 60 * 60 * 1000)
|
|
91
48
|
});
|
|
92
49
|
};
|
|
50
|
+
var refreshAccessToken = function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
51
|
+
return tslib_1.__generator(this, function (_a) {
|
|
52
|
+
if (!refreshPromise) {
|
|
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
|
+
// Lưu token mới
|
|
67
|
+
(0, saveCookiesClient_1["default"])({ value: tslib_1.__assign(tslib_1.__assign({}, currentSession), { access_token: newToken }) });
|
|
68
|
+
if (isServer) {
|
|
69
|
+
saveRefreshTokenServer(response);
|
|
70
|
+
}
|
|
71
|
+
return [2 /*return*/, newToken];
|
|
72
|
+
case 2:
|
|
73
|
+
err_1 = _a.sent();
|
|
74
|
+
if (!isServer) {
|
|
75
|
+
// Cookies.remove(COOKIE_SESSION_SIGN_IN)
|
|
76
|
+
window.location.href = constants_1.loginPage;
|
|
77
|
+
}
|
|
78
|
+
throw err_1;
|
|
79
|
+
case 3:
|
|
80
|
+
refreshPromise = null;
|
|
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 currentSession,
|
|
91
|
+
var currentSession, authToken, err_2, newToken;
|
|
95
92
|
var _a;
|
|
96
93
|
return tslib_1.__generator(this, function (_b) {
|
|
97
94
|
switch (_b.label) {
|
|
98
95
|
case 0:
|
|
99
96
|
currentSession = (0, getCookieSession_1["default"])();
|
|
100
|
-
|
|
101
|
-
if (!
|
|
102
|
-
config.headers.Authorization = "Bearer ".concat(
|
|
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);
|
|
103
100
|
if (!isServer) return [3 /*break*/, 7];
|
|
104
101
|
_b.label = 1;
|
|
105
102
|
case 1:
|
|
106
103
|
_b.trys.push([1, 3, , 7]);
|
|
107
104
|
return [4 /*yield*/, axios_1["default"].post("".concat(internalUrl, "/authen/authenticate"), {}, {
|
|
108
|
-
headers: tslib_1.__assign({ Authorization: "Bearer ".concat(
|
|
105
|
+
headers: tslib_1.__assign({ Authorization: "Bearer ".concat(authToken) }, getAuthHeaders())
|
|
109
106
|
})];
|
|
110
107
|
case 2:
|
|
111
108
|
_b.sent();
|
|
@@ -131,37 +128,20 @@ PHXAxiosInstance.interceptors.response.use(function (response) { return response
|
|
|
131
128
|
switch (_b.label) {
|
|
132
129
|
case 0:
|
|
133
130
|
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
|
-
}
|
|
131
|
+
if (!(((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === 401 && !originalRequest._retry)) return [3 /*break*/, 4];
|
|
146
132
|
originalRequest._retry = true;
|
|
147
|
-
isRefreshing = true;
|
|
148
133
|
_b.label = 1;
|
|
149
134
|
case 1:
|
|
150
|
-
_b.trys.push([1, 3,
|
|
135
|
+
_b.trys.push([1, 3, , 4]);
|
|
151
136
|
return [4 /*yield*/, refreshAccessToken()];
|
|
152
137
|
case 2:
|
|
153
138
|
newToken = _b.sent();
|
|
154
|
-
processQueue(null, newToken);
|
|
155
139
|
originalRequest.headers.Authorization = "Bearer ".concat(newToken);
|
|
156
140
|
return [2 /*return*/, PHXAxiosInstance(originalRequest)];
|
|
157
141
|
case 3:
|
|
158
142
|
err_3 = _b.sent();
|
|
159
|
-
processQueue(err_3, null);
|
|
160
143
|
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)];
|
|
144
|
+
case 4: return [2 /*return*/, Promise.reject(error)];
|
|
165
145
|
}
|
|
166
146
|
});
|
|
167
147
|
}); });
|
|
@@ -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,18 @@ 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
|
|
9
|
-
var failedQueue = [];
|
|
7
|
+
import { cookies as serverCookies, headers as serverHeaders } from 'next/headers';
|
|
8
|
+
var isServer = typeof window === 'undefined';
|
|
10
9
|
var publicUrl = getEnv('NEXT_PUBLIC_API_GATEWAY', process.env.NEXT_PUBLIC_API_GATEWAY);
|
|
11
10
|
var internalUrl = getEnv('NEXT_PUBLIC_API_GATEWAY_INTERNAL', process.env.NEXT_PUBLIC_API_GATEWAY_INTERNAL);
|
|
12
|
-
|
|
13
|
-
var
|
|
14
|
-
if (token === void 0) { token = null; }
|
|
15
|
-
failedQueue.forEach(function (prom) {
|
|
16
|
-
if (error) {
|
|
17
|
-
prom.reject(error);
|
|
18
|
-
}
|
|
19
|
-
else {
|
|
20
|
-
prom.resolve(token);
|
|
21
|
-
}
|
|
22
|
-
});
|
|
23
|
-
failedQueue = [];
|
|
24
|
-
};
|
|
11
|
+
// Dùng promise singleton để các request cùng chờ 1 lần refresh
|
|
12
|
+
var refreshPromise = null;
|
|
25
13
|
var PHXAxiosInstance = axios.create({
|
|
26
14
|
baseURL: publicUrl
|
|
27
15
|
});
|
|
28
16
|
var getAuthHeaders = function () {
|
|
29
17
|
if (isServer) {
|
|
30
|
-
|
|
31
|
-
var cookieStore = cookies();
|
|
18
|
+
var cookieStore = serverCookies();
|
|
32
19
|
var cookieHeader = cookieStore
|
|
33
20
|
.getAll()
|
|
34
21
|
.map(function (_a) {
|
|
@@ -38,47 +25,17 @@ var getAuthHeaders = function () {
|
|
|
38
25
|
.join('; ');
|
|
39
26
|
return {
|
|
40
27
|
Cookie: cookieHeader,
|
|
41
|
-
hostname:
|
|
28
|
+
hostname: serverHeaders().get('origin')
|
|
42
29
|
};
|
|
43
30
|
}
|
|
44
31
|
return {};
|
|
45
32
|
};
|
|
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
33
|
var saveRefreshTokenServer = function (response) {
|
|
77
34
|
var _a;
|
|
78
35
|
var setCookieHeader = ((_a = response.headers['set-cookie']) === null || _a === void 0 ? void 0 : _a[0]) || '';
|
|
79
36
|
var match = setCookieHeader.match(/refresh_token=([^;]+)/);
|
|
80
37
|
var refreshToken = (match === null || match === void 0 ? void 0 : match[1]) || '';
|
|
81
|
-
|
|
38
|
+
serverCookies().set(COOKIE_REFRESH_TOKEN, refreshToken, {
|
|
82
39
|
path: '/',
|
|
83
40
|
httpOnly: true,
|
|
84
41
|
secure: true,
|
|
@@ -86,22 +43,62 @@ var saveRefreshTokenServer = function (response) {
|
|
|
86
43
|
expires: new Date(Date.now() + 365 * 24 * 60 * 60 * 1000)
|
|
87
44
|
});
|
|
88
45
|
};
|
|
46
|
+
var refreshAccessToken = function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
47
|
+
return __generator(this, function (_a) {
|
|
48
|
+
if (!refreshPromise) {
|
|
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
|
+
// Lưu token mới
|
|
63
|
+
saveCookiesClient({ value: __assign(__assign({}, currentSession), { access_token: newToken }) });
|
|
64
|
+
if (isServer) {
|
|
65
|
+
saveRefreshTokenServer(response);
|
|
66
|
+
}
|
|
67
|
+
return [2 /*return*/, newToken];
|
|
68
|
+
case 2:
|
|
69
|
+
err_1 = _a.sent();
|
|
70
|
+
if (!isServer) {
|
|
71
|
+
// Cookies.remove(COOKIE_SESSION_SIGN_IN)
|
|
72
|
+
window.location.href = loginPage;
|
|
73
|
+
}
|
|
74
|
+
throw err_1;
|
|
75
|
+
case 3:
|
|
76
|
+
refreshPromise = null;
|
|
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 currentSession,
|
|
87
|
+
var currentSession, authToken, err_2, newToken;
|
|
91
88
|
var _a;
|
|
92
89
|
return __generator(this, function (_b) {
|
|
93
90
|
switch (_b.label) {
|
|
94
91
|
case 0:
|
|
95
92
|
currentSession = PHXFuncGetCookieSession();
|
|
96
|
-
|
|
97
|
-
if (!
|
|
98
|
-
config.headers.Authorization = "Bearer ".concat(
|
|
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);
|
|
99
96
|
if (!isServer) return [3 /*break*/, 7];
|
|
100
97
|
_b.label = 1;
|
|
101
98
|
case 1:
|
|
102
99
|
_b.trys.push([1, 3, , 7]);
|
|
103
100
|
return [4 /*yield*/, axios.post("".concat(internalUrl, "/authen/authenticate"), {}, {
|
|
104
|
-
headers: __assign({ Authorization: "Bearer ".concat(
|
|
101
|
+
headers: __assign({ Authorization: "Bearer ".concat(authToken) }, getAuthHeaders())
|
|
105
102
|
})];
|
|
106
103
|
case 2:
|
|
107
104
|
_b.sent();
|
|
@@ -127,37 +124,20 @@ PHXAxiosInstance.interceptors.response.use(function (response) { return response
|
|
|
127
124
|
switch (_b.label) {
|
|
128
125
|
case 0:
|
|
129
126
|
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
|
-
}
|
|
127
|
+
if (!(((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === 401 && !originalRequest._retry)) return [3 /*break*/, 4];
|
|
142
128
|
originalRequest._retry = true;
|
|
143
|
-
isRefreshing = true;
|
|
144
129
|
_b.label = 1;
|
|
145
130
|
case 1:
|
|
146
|
-
_b.trys.push([1, 3,
|
|
131
|
+
_b.trys.push([1, 3, , 4]);
|
|
147
132
|
return [4 /*yield*/, refreshAccessToken()];
|
|
148
133
|
case 2:
|
|
149
134
|
newToken = _b.sent();
|
|
150
|
-
processQueue(null, newToken);
|
|
151
135
|
originalRequest.headers.Authorization = "Bearer ".concat(newToken);
|
|
152
136
|
return [2 /*return*/, PHXAxiosInstance(originalRequest)];
|
|
153
137
|
case 3:
|
|
154
138
|
err_3 = _b.sent();
|
|
155
|
-
processQueue(err_3, null);
|
|
156
139
|
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)];
|
|
140
|
+
case 4: return [2 /*return*/, Promise.reject(error)];
|
|
161
141
|
}
|
|
162
142
|
});
|
|
163
143
|
}); });
|
|
@@ -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,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"axiosInstance.js","sourceRoot":"","sources":["../../src/axiosInstance.ts"],"names":[],"mappings":"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"}
|