phx-uikit 1.0.151 → 1.0.153
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,7 +48,7 @@ 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;
|
|
51
|
+
var currentSession, authTokenCookie, _a, _b, err_1, newToken;
|
|
52
52
|
var _c;
|
|
53
53
|
return tslib_1.__generator(this, function (_d) {
|
|
54
54
|
switch (_d.label) {
|
|
@@ -68,31 +68,35 @@ PHXAxiosInstance.interceptors.request.use(function (config) { return tslib_1.__a
|
|
|
68
68
|
_d.label = 4;
|
|
69
69
|
case 4:
|
|
70
70
|
authTokenCookie = _a;
|
|
71
|
-
if (!authTokenCookie) return [3 /*break*/,
|
|
71
|
+
if (!authTokenCookie) return [3 /*break*/, 11];
|
|
72
72
|
config.headers.Authorization = "Bearer ".concat(authTokenCookie);
|
|
73
|
-
if (!isServer) return [3 /*break*/,
|
|
73
|
+
if (!isServer) return [3 /*break*/, 11];
|
|
74
74
|
_d.label = 5;
|
|
75
75
|
case 5:
|
|
76
|
-
_d.trys.push([5, 7, ,
|
|
76
|
+
_d.trys.push([5, 7, , 11]);
|
|
77
77
|
return [4 /*yield*/, axios_1["default"].post("http://localhost:8100/authen/authenticate", {}, {
|
|
78
78
|
headers: tslib_1.__assign({ Authorization: "Bearer ".concat(authTokenCookie) }, getAuthHeaders())
|
|
79
79
|
})];
|
|
80
80
|
case 6:
|
|
81
81
|
_d.sent();
|
|
82
|
-
|
|
83
|
-
return [3 /*break*/, 8];
|
|
82
|
+
return [3 /*break*/, 11];
|
|
84
83
|
case 7:
|
|
85
84
|
err_1 = _d.sent();
|
|
86
|
-
if (((_c = err_1.response) === null || _c === void 0 ? void 0 : _c.status)
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
85
|
+
if (!(((_c = err_1.response) === null || _c === void 0 ? void 0 : _c.status) === 401)) return [3 /*break*/, 9];
|
|
86
|
+
return [4 /*yield*/, refreshAccessToken()];
|
|
87
|
+
case 8:
|
|
88
|
+
newToken = _d.sent();
|
|
89
|
+
console.log('newToken', newToken);
|
|
90
|
+
config.headers.Authorization = "Bearer ".concat(newToken);
|
|
91
|
+
return [3 /*break*/, 10];
|
|
92
|
+
case 9: throw err_1;
|
|
93
|
+
case 10: return [3 /*break*/, 11];
|
|
94
|
+
case 11: return [2 /*return*/, config];
|
|
91
95
|
}
|
|
92
96
|
});
|
|
93
97
|
}); });
|
|
94
98
|
PHXAxiosInstance.interceptors.response.use(function (response) { return response; }, function (error) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
95
|
-
var originalRequest,
|
|
99
|
+
var originalRequest, newToken, err_2;
|
|
96
100
|
var _a;
|
|
97
101
|
return tslib_1.__generator(this, function (_b) {
|
|
98
102
|
switch (_b.label) {
|
|
@@ -115,30 +119,15 @@ PHXAxiosInstance.interceptors.response.use(function (response) { return response
|
|
|
115
119
|
_b.label = 1;
|
|
116
120
|
case 1:
|
|
117
121
|
_b.trys.push([1, 3, 4, 5]);
|
|
118
|
-
return [4 /*yield*/,
|
|
119
|
-
headers: getAuthHeaders(),
|
|
120
|
-
withCredentials: true
|
|
121
|
-
})];
|
|
122
|
+
return [4 /*yield*/, refreshAccessToken()];
|
|
122
123
|
case 2:
|
|
123
|
-
|
|
124
|
-
newToken = data.token;
|
|
125
|
-
currentSession = (0, getCookieSession_1["default"])();
|
|
126
|
-
(0, saveCookiesClient_1["default"])({ value: tslib_1.__assign(tslib_1.__assign({}, currentSession), { access_token: newToken }) });
|
|
127
|
-
// delete auth token old(v1)
|
|
128
|
-
if (!isServer) {
|
|
129
|
-
js_cookie_1["default"].remove(constants_1.AUTH_TOKEN);
|
|
130
|
-
localStorage.removeItem(constants_1.isLoggedCookie);
|
|
131
|
-
}
|
|
124
|
+
newToken = _b.sent();
|
|
132
125
|
processQueue(null, newToken);
|
|
133
|
-
originalRequest.headers.Authorization =
|
|
126
|
+
originalRequest.headers.Authorization = "Bearer ".concat(newToken);
|
|
134
127
|
return [2 /*return*/, PHXAxiosInstance(originalRequest)];
|
|
135
128
|
case 3:
|
|
136
129
|
err_2 = _b.sent();
|
|
137
130
|
processQueue(err_2, null);
|
|
138
|
-
if (!isServer) {
|
|
139
|
-
js_cookie_1["default"].remove(constants_1.COOKIE_SESSION_SIGN_IN);
|
|
140
|
-
window.location.href = constants_1.loginPage;
|
|
141
|
-
}
|
|
142
131
|
return [2 /*return*/, Promise.reject(err_2)];
|
|
143
132
|
case 4:
|
|
144
133
|
isRefreshing = false;
|
|
@@ -173,4 +162,35 @@ var convertAuthToken = function () { return tslib_1.__awaiter(void 0, void 0, vo
|
|
|
173
162
|
}
|
|
174
163
|
});
|
|
175
164
|
}); };
|
|
165
|
+
var refreshAccessToken = function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
166
|
+
var data, newToken, currentSession, err_3;
|
|
167
|
+
return tslib_1.__generator(this, function (_a) {
|
|
168
|
+
switch (_a.label) {
|
|
169
|
+
case 0:
|
|
170
|
+
_a.trys.push([0, 2, , 3]);
|
|
171
|
+
return [4 /*yield*/, axios_1["default"].post("http://localhost:8100/authen/web/refresh-token", {}, {
|
|
172
|
+
headers: getAuthHeaders(),
|
|
173
|
+
withCredentials: true
|
|
174
|
+
})];
|
|
175
|
+
case 1:
|
|
176
|
+
data = (_a.sent()).data;
|
|
177
|
+
newToken = data.token;
|
|
178
|
+
currentSession = (0, getCookieSession_1["default"])();
|
|
179
|
+
(0, saveCookiesClient_1["default"])({ value: tslib_1.__assign(tslib_1.__assign({}, currentSession), { access_token: newToken }) });
|
|
180
|
+
if (!isServer) {
|
|
181
|
+
js_cookie_1["default"].remove(constants_1.AUTH_TOKEN);
|
|
182
|
+
localStorage.removeItem(constants_1.isLoggedCookie);
|
|
183
|
+
}
|
|
184
|
+
return [2 /*return*/, newToken];
|
|
185
|
+
case 2:
|
|
186
|
+
err_3 = _a.sent();
|
|
187
|
+
if (!isServer) {
|
|
188
|
+
js_cookie_1["default"].remove(constants_1.COOKIE_SESSION_SIGN_IN);
|
|
189
|
+
window.location.href = constants_1.loginPage;
|
|
190
|
+
}
|
|
191
|
+
throw err_3;
|
|
192
|
+
case 3: return [2 /*return*/];
|
|
193
|
+
}
|
|
194
|
+
});
|
|
195
|
+
}); };
|
|
176
196
|
//# sourceMappingURL=axiosInstance.js.map
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
1
|
+
{"version":3,"file":"axiosInstance.js","sourceRoot":"","sources":["../../src/axiosInstance.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,7 +44,7 @@ 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;
|
|
47
|
+
var currentSession, authTokenCookie, _a, _b, err_1, newToken;
|
|
48
48
|
var _c;
|
|
49
49
|
return __generator(this, function (_d) {
|
|
50
50
|
switch (_d.label) {
|
|
@@ -64,31 +64,35 @@ PHXAxiosInstance.interceptors.request.use(function (config) { return __awaiter(v
|
|
|
64
64
|
_d.label = 4;
|
|
65
65
|
case 4:
|
|
66
66
|
authTokenCookie = _a;
|
|
67
|
-
if (!authTokenCookie) return [3 /*break*/,
|
|
67
|
+
if (!authTokenCookie) return [3 /*break*/, 11];
|
|
68
68
|
config.headers.Authorization = "Bearer ".concat(authTokenCookie);
|
|
69
|
-
if (!isServer) return [3 /*break*/,
|
|
69
|
+
if (!isServer) return [3 /*break*/, 11];
|
|
70
70
|
_d.label = 5;
|
|
71
71
|
case 5:
|
|
72
|
-
_d.trys.push([5, 7, ,
|
|
72
|
+
_d.trys.push([5, 7, , 11]);
|
|
73
73
|
return [4 /*yield*/, axios.post("http://localhost:8100/authen/authenticate", {}, {
|
|
74
74
|
headers: __assign({ Authorization: "Bearer ".concat(authTokenCookie) }, getAuthHeaders())
|
|
75
75
|
})];
|
|
76
76
|
case 6:
|
|
77
77
|
_d.sent();
|
|
78
|
-
|
|
79
|
-
return [3 /*break*/, 8];
|
|
78
|
+
return [3 /*break*/, 11];
|
|
80
79
|
case 7:
|
|
81
80
|
err_1 = _d.sent();
|
|
82
|
-
if (((_c = err_1.response) === null || _c === void 0 ? void 0 : _c.status)
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
81
|
+
if (!(((_c = err_1.response) === null || _c === void 0 ? void 0 : _c.status) === 401)) return [3 /*break*/, 9];
|
|
82
|
+
return [4 /*yield*/, refreshAccessToken()];
|
|
83
|
+
case 8:
|
|
84
|
+
newToken = _d.sent();
|
|
85
|
+
console.log('newToken', newToken);
|
|
86
|
+
config.headers.Authorization = "Bearer ".concat(newToken);
|
|
87
|
+
return [3 /*break*/, 10];
|
|
88
|
+
case 9: throw err_1;
|
|
89
|
+
case 10: return [3 /*break*/, 11];
|
|
90
|
+
case 11: return [2 /*return*/, config];
|
|
87
91
|
}
|
|
88
92
|
});
|
|
89
93
|
}); });
|
|
90
94
|
PHXAxiosInstance.interceptors.response.use(function (response) { return response; }, function (error) { return __awaiter(void 0, void 0, void 0, function () {
|
|
91
|
-
var originalRequest,
|
|
95
|
+
var originalRequest, newToken, err_2;
|
|
92
96
|
var _a;
|
|
93
97
|
return __generator(this, function (_b) {
|
|
94
98
|
switch (_b.label) {
|
|
@@ -111,30 +115,15 @@ PHXAxiosInstance.interceptors.response.use(function (response) { return response
|
|
|
111
115
|
_b.label = 1;
|
|
112
116
|
case 1:
|
|
113
117
|
_b.trys.push([1, 3, 4, 5]);
|
|
114
|
-
return [4 /*yield*/,
|
|
115
|
-
headers: getAuthHeaders(),
|
|
116
|
-
withCredentials: true
|
|
117
|
-
})];
|
|
118
|
+
return [4 /*yield*/, refreshAccessToken()];
|
|
118
119
|
case 2:
|
|
119
|
-
|
|
120
|
-
newToken = data.token;
|
|
121
|
-
currentSession = PHXFuncGetCookieSession();
|
|
122
|
-
saveCookiesClient({ value: __assign(__assign({}, currentSession), { access_token: newToken }) });
|
|
123
|
-
// delete auth token old(v1)
|
|
124
|
-
if (!isServer) {
|
|
125
|
-
Cookies.remove(AUTH_TOKEN);
|
|
126
|
-
localStorage.removeItem(isLoggedCookie);
|
|
127
|
-
}
|
|
120
|
+
newToken = _b.sent();
|
|
128
121
|
processQueue(null, newToken);
|
|
129
|
-
originalRequest.headers.Authorization =
|
|
122
|
+
originalRequest.headers.Authorization = "Bearer ".concat(newToken);
|
|
130
123
|
return [2 /*return*/, PHXAxiosInstance(originalRequest)];
|
|
131
124
|
case 3:
|
|
132
125
|
err_2 = _b.sent();
|
|
133
126
|
processQueue(err_2, null);
|
|
134
|
-
if (!isServer) {
|
|
135
|
-
Cookies.remove(COOKIE_SESSION_SIGN_IN);
|
|
136
|
-
window.location.href = loginPage;
|
|
137
|
-
}
|
|
138
127
|
return [2 /*return*/, Promise.reject(err_2)];
|
|
139
128
|
case 4:
|
|
140
129
|
isRefreshing = false;
|
|
@@ -169,5 +158,36 @@ var convertAuthToken = function () { return __awaiter(void 0, void 0, void 0, fu
|
|
|
169
158
|
}
|
|
170
159
|
});
|
|
171
160
|
}); };
|
|
161
|
+
var refreshAccessToken = function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
162
|
+
var data, newToken, currentSession, err_3;
|
|
163
|
+
return __generator(this, function (_a) {
|
|
164
|
+
switch (_a.label) {
|
|
165
|
+
case 0:
|
|
166
|
+
_a.trys.push([0, 2, , 3]);
|
|
167
|
+
return [4 /*yield*/, axios.post("http://localhost:8100/authen/web/refresh-token", {}, {
|
|
168
|
+
headers: getAuthHeaders(),
|
|
169
|
+
withCredentials: true
|
|
170
|
+
})];
|
|
171
|
+
case 1:
|
|
172
|
+
data = (_a.sent()).data;
|
|
173
|
+
newToken = data.token;
|
|
174
|
+
currentSession = PHXFuncGetCookieSession();
|
|
175
|
+
saveCookiesClient({ value: __assign(__assign({}, currentSession), { access_token: newToken }) });
|
|
176
|
+
if (!isServer) {
|
|
177
|
+
Cookies.remove(AUTH_TOKEN);
|
|
178
|
+
localStorage.removeItem(isLoggedCookie);
|
|
179
|
+
}
|
|
180
|
+
return [2 /*return*/, newToken];
|
|
181
|
+
case 2:
|
|
182
|
+
err_3 = _a.sent();
|
|
183
|
+
if (!isServer) {
|
|
184
|
+
Cookies.remove(COOKIE_SESSION_SIGN_IN);
|
|
185
|
+
window.location.href = loginPage;
|
|
186
|
+
}
|
|
187
|
+
throw err_3;
|
|
188
|
+
case 3: return [2 /*return*/];
|
|
189
|
+
}
|
|
190
|
+
});
|
|
191
|
+
}); };
|
|
172
192
|
export { PHXAxiosInstance };
|
|
173
193
|
//# sourceMappingURL=axiosInstance.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"axiosInstance.js","sourceRoot":"","sources":["../../src/axiosInstance.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,OAAO,MAAM,WAAW,CAAA;AAC/B,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,UAAU,EAAE,sBAAsB,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AACjG,OAAO,iBAAiB,MAAM,qCAAqC,CAAA;AACnE,OAAO,uBAAuB,MAAM,oCAAoC,CAAA;AACxE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAE/C,IAAI,YAAY,GAAG,KAAK,CAAA;AACxB,IAAI,WAAW,GAAU,EAAE,CAAA;AAC3B,IAAM,SAAS,GAAG,MAAM,CAAC,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,KAAK,CAAC,MAAM,CAAC;IACpC,OAAO,EAAE,SAAS;CACnB,CAAC,CAAA;AAEF,IAAM,cAAc,GAAG;IACrB,IAAI,QAAQ,EAAE;QACZ,cAAc;QACd,IAAM,WAAW,GAAG,OAAO,EAAE,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,OAAO,EAAE,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,uBAAuB,EAAE,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;qBAEhG,eAAe,EAAf,
|
|
1
|
+
{"version":3,"file":"axiosInstance.js","sourceRoot":"","sources":["../../src/axiosInstance.ts"],"names":[],"mappings":"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"}
|