phx-uikit 1.0.156 → 1.0.158
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.
- package/dist/cjs/axiosInstance.js +84 -81
- package/dist/cjs/axiosInstance.js.map +1 -1
- package/dist/cjs/components/LoginV3/LoginV3.js +2 -2
- package/dist/cjs/components/LoginV3/LoginV3.js.map +1 -1
- package/dist/esm/axiosInstance.js +84 -81
- package/dist/esm/axiosInstance.js.map +1 -1
- package/dist/esm/components/LoginV3/LoginV3.js +2 -2
- package/dist/esm/components/LoginV3/LoginV3.js.map +1 -1
- package/package.json +1 -1
|
@@ -47,8 +47,83 @@ var getAuthHeaders = function () {
|
|
|
47
47
|
}
|
|
48
48
|
return {};
|
|
49
49
|
};
|
|
50
|
+
// convert auth token -> access + refresh token
|
|
51
|
+
var convertAuthToken = function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
52
|
+
var authToken, data, accessToken, currentSession, e_1;
|
|
53
|
+
return tslib_1.__generator(this, function (_a) {
|
|
54
|
+
switch (_a.label) {
|
|
55
|
+
case 0:
|
|
56
|
+
_a.trys.push([0, 2, , 3]);
|
|
57
|
+
authToken = !isServer && JSON.parse(js_cookie_1["default"].get(constants_1.AUTH_TOKEN)).token;
|
|
58
|
+
return [4 /*yield*/, axios_1["default"].post("http://localhost:8100/authen/convert", { authToken: authToken }, {
|
|
59
|
+
withCredentials: true
|
|
60
|
+
})];
|
|
61
|
+
case 1:
|
|
62
|
+
data = (_a.sent()).data;
|
|
63
|
+
console.log('data', data);
|
|
64
|
+
accessToken = data.token;
|
|
65
|
+
currentSession = (0, getCookieSession_1["default"])();
|
|
66
|
+
(0, saveCookiesClient_1["default"])({ value: tslib_1.__assign(tslib_1.__assign({}, currentSession), { access_token: accessToken }) });
|
|
67
|
+
js_cookie_1["default"].remove(constants_1.AUTH_TOKEN);
|
|
68
|
+
return [2 /*return*/, accessToken];
|
|
69
|
+
case 2:
|
|
70
|
+
e_1 = _a.sent();
|
|
71
|
+
console.log(e_1);
|
|
72
|
+
return [2 /*return*/];
|
|
73
|
+
case 3: return [2 /*return*/];
|
|
74
|
+
}
|
|
75
|
+
});
|
|
76
|
+
}); };
|
|
77
|
+
var refreshAccessToken = function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
78
|
+
var response, newToken, currentSession, err_1;
|
|
79
|
+
return tslib_1.__generator(this, function (_a) {
|
|
80
|
+
switch (_a.label) {
|
|
81
|
+
case 0:
|
|
82
|
+
_a.trys.push([0, 2, , 3]);
|
|
83
|
+
return [4 /*yield*/, axios_1["default"].post("".concat(publicUrl, "/authen/web/refresh-token"), {}, {
|
|
84
|
+
headers: getAuthHeaders(),
|
|
85
|
+
withCredentials: true
|
|
86
|
+
})];
|
|
87
|
+
case 1:
|
|
88
|
+
response = _a.sent();
|
|
89
|
+
newToken = response.data.token;
|
|
90
|
+
currentSession = (0, getCookieSession_1["default"])();
|
|
91
|
+
(0, saveCookiesClient_1["default"])({ value: tslib_1.__assign(tslib_1.__assign({}, currentSession), { access_token: newToken }) });
|
|
92
|
+
if (!isServer) {
|
|
93
|
+
js_cookie_1["default"].remove(constants_1.AUTH_TOKEN);
|
|
94
|
+
localStorage.removeItem(constants_1.isLoggedCookie);
|
|
95
|
+
}
|
|
96
|
+
else {
|
|
97
|
+
// save refresh token from server site
|
|
98
|
+
saveRefreshTokenServer(response);
|
|
99
|
+
}
|
|
100
|
+
return [2 /*return*/, newToken];
|
|
101
|
+
case 2:
|
|
102
|
+
err_1 = _a.sent();
|
|
103
|
+
if (!isServer) {
|
|
104
|
+
js_cookie_1["default"].remove(constants_1.COOKIE_SESSION_SIGN_IN);
|
|
105
|
+
window.location.href = constants_1.loginPage;
|
|
106
|
+
}
|
|
107
|
+
throw err_1;
|
|
108
|
+
case 3: return [2 /*return*/];
|
|
109
|
+
}
|
|
110
|
+
});
|
|
111
|
+
}); };
|
|
112
|
+
var saveRefreshTokenServer = function (response) {
|
|
113
|
+
var _a;
|
|
114
|
+
var setCookieHeader = ((_a = response.headers['set-cookie']) === null || _a === void 0 ? void 0 : _a[0]) || '';
|
|
115
|
+
var match = setCookieHeader.match(/refresh_token=([^;]+)/);
|
|
116
|
+
var refreshToken = (match === null || match === void 0 ? void 0 : match[1]) || '';
|
|
117
|
+
(0, headers_1.cookies)().set(constants_1.COOKIE_REFRESH_TOKEN, refreshToken, {
|
|
118
|
+
path: '/',
|
|
119
|
+
httpOnly: true,
|
|
120
|
+
secure: true,
|
|
121
|
+
sameSite: 'lax',
|
|
122
|
+
expires: new Date(Date.now() + 365 * 24 * 60 * 60 * 1000)
|
|
123
|
+
});
|
|
124
|
+
};
|
|
50
125
|
PHXAxiosInstance.interceptors.request.use(function (config) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
51
|
-
var currentSession, authTokenCookie, _a, _b,
|
|
126
|
+
var currentSession, authTokenCookie, _a, _b, err_2, newToken;
|
|
52
127
|
var _c;
|
|
53
128
|
return tslib_1.__generator(this, function (_d) {
|
|
54
129
|
switch (_d.label) {
|
|
@@ -74,29 +149,28 @@ PHXAxiosInstance.interceptors.request.use(function (config) { return tslib_1.__a
|
|
|
74
149
|
_d.label = 5;
|
|
75
150
|
case 5:
|
|
76
151
|
_d.trys.push([5, 7, , 11]);
|
|
77
|
-
return [4 /*yield*/, axios_1["default"].post("
|
|
152
|
+
return [4 /*yield*/, axios_1["default"].post("".concat(publicUrl, "/auth"), {}, {
|
|
78
153
|
headers: tslib_1.__assign({ Authorization: "Bearer ".concat(authTokenCookie) }, getAuthHeaders())
|
|
79
154
|
})];
|
|
80
155
|
case 6:
|
|
81
156
|
_d.sent();
|
|
82
157
|
return [3 /*break*/, 11];
|
|
83
158
|
case 7:
|
|
84
|
-
|
|
85
|
-
if (!(((_c =
|
|
159
|
+
err_2 = _d.sent();
|
|
160
|
+
if (!(((_c = err_2.response) === null || _c === void 0 ? void 0 : _c.status) === 401)) return [3 /*break*/, 9];
|
|
86
161
|
return [4 /*yield*/, refreshAccessToken()];
|
|
87
162
|
case 8:
|
|
88
163
|
newToken = _d.sent();
|
|
89
|
-
console.log('newToken', newToken);
|
|
90
164
|
config.headers.Authorization = "Bearer ".concat(newToken);
|
|
91
165
|
return [3 /*break*/, 10];
|
|
92
|
-
case 9: throw
|
|
166
|
+
case 9: throw err_2;
|
|
93
167
|
case 10: return [3 /*break*/, 11];
|
|
94
168
|
case 11: return [2 /*return*/, config];
|
|
95
169
|
}
|
|
96
170
|
});
|
|
97
171
|
}); });
|
|
98
172
|
PHXAxiosInstance.interceptors.response.use(function (response) { return response; }, function (error) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
99
|
-
var originalRequest, newToken,
|
|
173
|
+
var originalRequest, newToken, err_3;
|
|
100
174
|
var _a;
|
|
101
175
|
return tslib_1.__generator(this, function (_b) {
|
|
102
176
|
switch (_b.label) {
|
|
@@ -126,9 +200,9 @@ PHXAxiosInstance.interceptors.response.use(function (response) { return response
|
|
|
126
200
|
originalRequest.headers.Authorization = "Bearer ".concat(newToken);
|
|
127
201
|
return [2 /*return*/, PHXAxiosInstance(originalRequest)];
|
|
128
202
|
case 3:
|
|
129
|
-
|
|
130
|
-
processQueue(
|
|
131
|
-
return [2 /*return*/, Promise.reject(
|
|
203
|
+
err_3 = _b.sent();
|
|
204
|
+
processQueue(err_3, null);
|
|
205
|
+
return [2 /*return*/, Promise.reject(err_3)];
|
|
132
206
|
case 4:
|
|
133
207
|
isRefreshing = false;
|
|
134
208
|
return [7 /*endfinally*/];
|
|
@@ -136,75 +210,4 @@ PHXAxiosInstance.interceptors.response.use(function (response) { return response
|
|
|
136
210
|
}
|
|
137
211
|
});
|
|
138
212
|
}); });
|
|
139
|
-
// convert auth token -> access + refresh token
|
|
140
|
-
var convertAuthToken = function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
141
|
-
var authToken, data, accessToken, currentSession, e_1;
|
|
142
|
-
return tslib_1.__generator(this, function (_a) {
|
|
143
|
-
switch (_a.label) {
|
|
144
|
-
case 0:
|
|
145
|
-
_a.trys.push([0, 2, , 3]);
|
|
146
|
-
authToken = !isServer && JSON.parse(js_cookie_1["default"].get(constants_1.AUTH_TOKEN)).token;
|
|
147
|
-
return [4 /*yield*/, axios_1["default"].post("http://localhost:8100/authen/convert", { authToken: authToken }, {
|
|
148
|
-
withCredentials: true
|
|
149
|
-
})];
|
|
150
|
-
case 1:
|
|
151
|
-
data = (_a.sent()).data;
|
|
152
|
-
accessToken = data.token;
|
|
153
|
-
currentSession = (0, getCookieSession_1["default"])();
|
|
154
|
-
(0, saveCookiesClient_1["default"])({ value: tslib_1.__assign(tslib_1.__assign({}, currentSession), { access_token: accessToken }) });
|
|
155
|
-
js_cookie_1["default"].remove(constants_1.AUTH_TOKEN);
|
|
156
|
-
return [2 /*return*/, accessToken];
|
|
157
|
-
case 2:
|
|
158
|
-
e_1 = _a.sent();
|
|
159
|
-
console.log(e_1);
|
|
160
|
-
return [2 /*return*/];
|
|
161
|
-
case 3: return [2 /*return*/];
|
|
162
|
-
}
|
|
163
|
-
});
|
|
164
|
-
}); };
|
|
165
|
-
var refreshAccessToken = function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
166
|
-
var response, newToken, currentSession, setCookieHeader, match, refreshToken, err_3;
|
|
167
|
-
var _a;
|
|
168
|
-
return tslib_1.__generator(this, function (_b) {
|
|
169
|
-
switch (_b.label) {
|
|
170
|
-
case 0:
|
|
171
|
-
_b.trys.push([0, 2, , 3]);
|
|
172
|
-
return [4 /*yield*/, axios_1["default"].post("http://localhost:8100/authen/web/refresh-token", {}, {
|
|
173
|
-
headers: getAuthHeaders(),
|
|
174
|
-
withCredentials: true
|
|
175
|
-
})];
|
|
176
|
-
case 1:
|
|
177
|
-
response = _b.sent();
|
|
178
|
-
newToken = response.data.token;
|
|
179
|
-
currentSession = (0, getCookieSession_1["default"])();
|
|
180
|
-
(0, saveCookiesClient_1["default"])({ value: tslib_1.__assign(tslib_1.__assign({}, currentSession), { access_token: newToken }) });
|
|
181
|
-
if (!isServer) {
|
|
182
|
-
js_cookie_1["default"].remove(constants_1.AUTH_TOKEN);
|
|
183
|
-
localStorage.removeItem(constants_1.isLoggedCookie);
|
|
184
|
-
}
|
|
185
|
-
else {
|
|
186
|
-
setCookieHeader = ((_a = response.headers['set-cookie']) === null || _a === void 0 ? void 0 : _a[0]) || '';
|
|
187
|
-
match = setCookieHeader.match(/refresh_token=([^;]+)/);
|
|
188
|
-
refreshToken = (match === null || match === void 0 ? void 0 : match[1]) || '';
|
|
189
|
-
console.log('refreshToken', refreshToken);
|
|
190
|
-
(0, headers_1.cookies)().set(constants_1.COOKIE_REFRESH_TOKEN, refreshToken, {
|
|
191
|
-
path: '/',
|
|
192
|
-
httpOnly: true,
|
|
193
|
-
secure: true,
|
|
194
|
-
sameSite: 'lax',
|
|
195
|
-
expires: 365 * 24 * 60 * 60 * 1000
|
|
196
|
-
});
|
|
197
|
-
}
|
|
198
|
-
return [2 /*return*/, newToken];
|
|
199
|
-
case 2:
|
|
200
|
-
err_3 = _b.sent();
|
|
201
|
-
if (!isServer) {
|
|
202
|
-
js_cookie_1["default"].remove(constants_1.COOKIE_SESSION_SIGN_IN);
|
|
203
|
-
window.location.href = constants_1.loginPage;
|
|
204
|
-
}
|
|
205
|
-
throw err_3;
|
|
206
|
-
case 3: return [2 /*return*/];
|
|
207
|
-
}
|
|
208
|
-
});
|
|
209
|
-
}); };
|
|
210
213
|
//# 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,+CAAuH;AACvH,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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"}
|
|
@@ -19,14 +19,14 @@ var PHXLoginV3 = function (props) {
|
|
|
19
19
|
var _c = (0, react_1.useState)(false), loading = _c[0], setLoading = _c[1];
|
|
20
20
|
var schoolLogo = (0, read_env_config_1.getEnv)('NEXT_PUBLIC_ENV_LOGIN_LOGO', process.env.NEXT_PUBLIC_ENV_LOGIN_LOGO);
|
|
21
21
|
var _d = (0, react_hook_form_1.useForm)(), handleSubmit = _d.handleSubmit, register = _d.register, errors = _d.formState.errors;
|
|
22
|
-
|
|
22
|
+
var uri = (0, read_env_config_1.getEnv)('NEXT_PUBLIC_API_GATEWAY', process.env.NEXT_PUBLIC_API_GATEWAY);
|
|
23
23
|
var handleLogin = function (email, password) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
24
24
|
var response, error_1;
|
|
25
25
|
return tslib_1.__generator(this, function (_a) {
|
|
26
26
|
switch (_a.label) {
|
|
27
27
|
case 0:
|
|
28
28
|
_a.trys.push([0, 3, , 4]);
|
|
29
|
-
return [4 /*yield*/, fetch("
|
|
29
|
+
return [4 /*yield*/, fetch("".concat(uri, "/authen/login"), {
|
|
30
30
|
headers: {
|
|
31
31
|
'Content-Type': 'application/json'
|
|
32
32
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoginV3.js","sourceRoot":"","sources":["../../../../src/components/LoginV3/LoginV3.tsx"],"names":[],"mappings":";;;;AAAA,qDAAkD;AAClD,mDAAyC;AACzC,kCAAmC;AACnC,oCAAqC;AACrC,oCAAqC;AACrC,yDAA8C;AAC9C,wFAAyD;AACzD,wCAAyC;AACzC,sEAAsC;AACtC,sFAA8D;AAUvD,IAAM,UAAU,GAAG,UAAC,KAAsB;IACvC,IAAA,IAAI,GAAgD,KAAK,KAArD,EAAE,MAAM,GAAwC,KAAK,OAA7C,EAAE,MAAM,GAAgC,KAAK,OAArC,EAAE,YAAY,GAAkB,KAAK,aAAvB,EAAE,WAAW,GAAK,KAAK,YAAV,CAAU;IAC3D,IAAA,KAA0B,IAAA,gBAAQ,EAAU,IAAI,CAAC,EAAhD,QAAQ,QAAA,EAAE,WAAW,QAA2B,CAAA;IACjD,IAAA,KAA8B,IAAA,gBAAQ,EAAU,KAAK,CAAC,EAArD,UAAU,QAAA,EAAE,aAAa,QAA4B,CAAA;IACtD,IAAA,KAAwB,IAAA,gBAAQ,EAAU,KAAK,CAAC,EAA/C,OAAO,QAAA,EAAE,UAAU,QAA4B,CAAA;IACtD,IAAM,UAAU,GAAG,IAAA,wBAAM,EAAC,4BAA4B,EAAE,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAA;IAEzF,IAAA,KAIF,IAAA,yBAAO,GAAE,EAHX,YAAY,kBAAA,EACZ,QAAQ,cAAA,EACK,MAAM,sBACR,CAAA;IAEb,
|
|
1
|
+
{"version":3,"file":"LoginV3.js","sourceRoot":"","sources":["../../../../src/components/LoginV3/LoginV3.tsx"],"names":[],"mappings":"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"}
|
|
@@ -43,8 +43,83 @@ var getAuthHeaders = function () {
|
|
|
43
43
|
}
|
|
44
44
|
return {};
|
|
45
45
|
};
|
|
46
|
+
// convert auth token -> access + refresh token
|
|
47
|
+
var convertAuthToken = function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
48
|
+
var authToken, data, accessToken, currentSession, e_1;
|
|
49
|
+
return __generator(this, function (_a) {
|
|
50
|
+
switch (_a.label) {
|
|
51
|
+
case 0:
|
|
52
|
+
_a.trys.push([0, 2, , 3]);
|
|
53
|
+
authToken = !isServer && JSON.parse(Cookies.get(AUTH_TOKEN)).token;
|
|
54
|
+
return [4 /*yield*/, axios.post("http://localhost:8100/authen/convert", { authToken: authToken }, {
|
|
55
|
+
withCredentials: true
|
|
56
|
+
})];
|
|
57
|
+
case 1:
|
|
58
|
+
data = (_a.sent()).data;
|
|
59
|
+
console.log('data', data);
|
|
60
|
+
accessToken = data.token;
|
|
61
|
+
currentSession = PHXFuncGetCookieSession();
|
|
62
|
+
saveCookiesClient({ value: __assign(__assign({}, currentSession), { access_token: accessToken }) });
|
|
63
|
+
Cookies.remove(AUTH_TOKEN);
|
|
64
|
+
return [2 /*return*/, accessToken];
|
|
65
|
+
case 2:
|
|
66
|
+
e_1 = _a.sent();
|
|
67
|
+
console.log(e_1);
|
|
68
|
+
return [2 /*return*/];
|
|
69
|
+
case 3: return [2 /*return*/];
|
|
70
|
+
}
|
|
71
|
+
});
|
|
72
|
+
}); };
|
|
73
|
+
var refreshAccessToken = function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
74
|
+
var response, newToken, currentSession, err_1;
|
|
75
|
+
return __generator(this, function (_a) {
|
|
76
|
+
switch (_a.label) {
|
|
77
|
+
case 0:
|
|
78
|
+
_a.trys.push([0, 2, , 3]);
|
|
79
|
+
return [4 /*yield*/, axios.post("".concat(publicUrl, "/authen/web/refresh-token"), {}, {
|
|
80
|
+
headers: getAuthHeaders(),
|
|
81
|
+
withCredentials: true
|
|
82
|
+
})];
|
|
83
|
+
case 1:
|
|
84
|
+
response = _a.sent();
|
|
85
|
+
newToken = response.data.token;
|
|
86
|
+
currentSession = PHXFuncGetCookieSession();
|
|
87
|
+
saveCookiesClient({ value: __assign(__assign({}, currentSession), { access_token: newToken }) });
|
|
88
|
+
if (!isServer) {
|
|
89
|
+
Cookies.remove(AUTH_TOKEN);
|
|
90
|
+
localStorage.removeItem(isLoggedCookie);
|
|
91
|
+
}
|
|
92
|
+
else {
|
|
93
|
+
// save refresh token from server site
|
|
94
|
+
saveRefreshTokenServer(response);
|
|
95
|
+
}
|
|
96
|
+
return [2 /*return*/, newToken];
|
|
97
|
+
case 2:
|
|
98
|
+
err_1 = _a.sent();
|
|
99
|
+
if (!isServer) {
|
|
100
|
+
Cookies.remove(COOKIE_SESSION_SIGN_IN);
|
|
101
|
+
window.location.href = loginPage;
|
|
102
|
+
}
|
|
103
|
+
throw err_1;
|
|
104
|
+
case 3: return [2 /*return*/];
|
|
105
|
+
}
|
|
106
|
+
});
|
|
107
|
+
}); };
|
|
108
|
+
var saveRefreshTokenServer = function (response) {
|
|
109
|
+
var _a;
|
|
110
|
+
var setCookieHeader = ((_a = response.headers['set-cookie']) === null || _a === void 0 ? void 0 : _a[0]) || '';
|
|
111
|
+
var match = setCookieHeader.match(/refresh_token=([^;]+)/);
|
|
112
|
+
var refreshToken = (match === null || match === void 0 ? void 0 : match[1]) || '';
|
|
113
|
+
cookies().set(COOKIE_REFRESH_TOKEN, refreshToken, {
|
|
114
|
+
path: '/',
|
|
115
|
+
httpOnly: true,
|
|
116
|
+
secure: true,
|
|
117
|
+
sameSite: 'lax',
|
|
118
|
+
expires: new Date(Date.now() + 365 * 24 * 60 * 60 * 1000)
|
|
119
|
+
});
|
|
120
|
+
};
|
|
46
121
|
PHXAxiosInstance.interceptors.request.use(function (config) { return __awaiter(void 0, void 0, void 0, function () {
|
|
47
|
-
var currentSession, authTokenCookie, _a, _b,
|
|
122
|
+
var currentSession, authTokenCookie, _a, _b, err_2, newToken;
|
|
48
123
|
var _c;
|
|
49
124
|
return __generator(this, function (_d) {
|
|
50
125
|
switch (_d.label) {
|
|
@@ -70,29 +145,28 @@ PHXAxiosInstance.interceptors.request.use(function (config) { return __awaiter(v
|
|
|
70
145
|
_d.label = 5;
|
|
71
146
|
case 5:
|
|
72
147
|
_d.trys.push([5, 7, , 11]);
|
|
73
|
-
return [4 /*yield*/, axios.post("
|
|
148
|
+
return [4 /*yield*/, axios.post("".concat(publicUrl, "/auth"), {}, {
|
|
74
149
|
headers: __assign({ Authorization: "Bearer ".concat(authTokenCookie) }, getAuthHeaders())
|
|
75
150
|
})];
|
|
76
151
|
case 6:
|
|
77
152
|
_d.sent();
|
|
78
153
|
return [3 /*break*/, 11];
|
|
79
154
|
case 7:
|
|
80
|
-
|
|
81
|
-
if (!(((_c =
|
|
155
|
+
err_2 = _d.sent();
|
|
156
|
+
if (!(((_c = err_2.response) === null || _c === void 0 ? void 0 : _c.status) === 401)) return [3 /*break*/, 9];
|
|
82
157
|
return [4 /*yield*/, refreshAccessToken()];
|
|
83
158
|
case 8:
|
|
84
159
|
newToken = _d.sent();
|
|
85
|
-
console.log('newToken', newToken);
|
|
86
160
|
config.headers.Authorization = "Bearer ".concat(newToken);
|
|
87
161
|
return [3 /*break*/, 10];
|
|
88
|
-
case 9: throw
|
|
162
|
+
case 9: throw err_2;
|
|
89
163
|
case 10: return [3 /*break*/, 11];
|
|
90
164
|
case 11: return [2 /*return*/, config];
|
|
91
165
|
}
|
|
92
166
|
});
|
|
93
167
|
}); });
|
|
94
168
|
PHXAxiosInstance.interceptors.response.use(function (response) { return response; }, function (error) { return __awaiter(void 0, void 0, void 0, function () {
|
|
95
|
-
var originalRequest, newToken,
|
|
169
|
+
var originalRequest, newToken, err_3;
|
|
96
170
|
var _a;
|
|
97
171
|
return __generator(this, function (_b) {
|
|
98
172
|
switch (_b.label) {
|
|
@@ -122,9 +196,9 @@ PHXAxiosInstance.interceptors.response.use(function (response) { return response
|
|
|
122
196
|
originalRequest.headers.Authorization = "Bearer ".concat(newToken);
|
|
123
197
|
return [2 /*return*/, PHXAxiosInstance(originalRequest)];
|
|
124
198
|
case 3:
|
|
125
|
-
|
|
126
|
-
processQueue(
|
|
127
|
-
return [2 /*return*/, Promise.reject(
|
|
199
|
+
err_3 = _b.sent();
|
|
200
|
+
processQueue(err_3, null);
|
|
201
|
+
return [2 /*return*/, Promise.reject(err_3)];
|
|
128
202
|
case 4:
|
|
129
203
|
isRefreshing = false;
|
|
130
204
|
return [7 /*endfinally*/];
|
|
@@ -132,76 +206,5 @@ PHXAxiosInstance.interceptors.response.use(function (response) { return response
|
|
|
132
206
|
}
|
|
133
207
|
});
|
|
134
208
|
}); });
|
|
135
|
-
// convert auth token -> access + refresh token
|
|
136
|
-
var convertAuthToken = function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
137
|
-
var authToken, data, accessToken, currentSession, e_1;
|
|
138
|
-
return __generator(this, function (_a) {
|
|
139
|
-
switch (_a.label) {
|
|
140
|
-
case 0:
|
|
141
|
-
_a.trys.push([0, 2, , 3]);
|
|
142
|
-
authToken = !isServer && JSON.parse(Cookies.get(AUTH_TOKEN)).token;
|
|
143
|
-
return [4 /*yield*/, axios.post("http://localhost:8100/authen/convert", { authToken: authToken }, {
|
|
144
|
-
withCredentials: true
|
|
145
|
-
})];
|
|
146
|
-
case 1:
|
|
147
|
-
data = (_a.sent()).data;
|
|
148
|
-
accessToken = data.token;
|
|
149
|
-
currentSession = PHXFuncGetCookieSession();
|
|
150
|
-
saveCookiesClient({ value: __assign(__assign({}, currentSession), { access_token: accessToken }) });
|
|
151
|
-
Cookies.remove(AUTH_TOKEN);
|
|
152
|
-
return [2 /*return*/, accessToken];
|
|
153
|
-
case 2:
|
|
154
|
-
e_1 = _a.sent();
|
|
155
|
-
console.log(e_1);
|
|
156
|
-
return [2 /*return*/];
|
|
157
|
-
case 3: return [2 /*return*/];
|
|
158
|
-
}
|
|
159
|
-
});
|
|
160
|
-
}); };
|
|
161
|
-
var refreshAccessToken = function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
162
|
-
var response, newToken, currentSession, setCookieHeader, match, refreshToken, err_3;
|
|
163
|
-
var _a;
|
|
164
|
-
return __generator(this, function (_b) {
|
|
165
|
-
switch (_b.label) {
|
|
166
|
-
case 0:
|
|
167
|
-
_b.trys.push([0, 2, , 3]);
|
|
168
|
-
return [4 /*yield*/, axios.post("http://localhost:8100/authen/web/refresh-token", {}, {
|
|
169
|
-
headers: getAuthHeaders(),
|
|
170
|
-
withCredentials: true
|
|
171
|
-
})];
|
|
172
|
-
case 1:
|
|
173
|
-
response = _b.sent();
|
|
174
|
-
newToken = response.data.token;
|
|
175
|
-
currentSession = PHXFuncGetCookieSession();
|
|
176
|
-
saveCookiesClient({ value: __assign(__assign({}, currentSession), { access_token: newToken }) });
|
|
177
|
-
if (!isServer) {
|
|
178
|
-
Cookies.remove(AUTH_TOKEN);
|
|
179
|
-
localStorage.removeItem(isLoggedCookie);
|
|
180
|
-
}
|
|
181
|
-
else {
|
|
182
|
-
setCookieHeader = ((_a = response.headers['set-cookie']) === null || _a === void 0 ? void 0 : _a[0]) || '';
|
|
183
|
-
match = setCookieHeader.match(/refresh_token=([^;]+)/);
|
|
184
|
-
refreshToken = (match === null || match === void 0 ? void 0 : match[1]) || '';
|
|
185
|
-
console.log('refreshToken', refreshToken);
|
|
186
|
-
cookies().set(COOKIE_REFRESH_TOKEN, refreshToken, {
|
|
187
|
-
path: '/',
|
|
188
|
-
httpOnly: true,
|
|
189
|
-
secure: true,
|
|
190
|
-
sameSite: 'lax',
|
|
191
|
-
expires: 365 * 24 * 60 * 60 * 1000
|
|
192
|
-
});
|
|
193
|
-
}
|
|
194
|
-
return [2 /*return*/, newToken];
|
|
195
|
-
case 2:
|
|
196
|
-
err_3 = _b.sent();
|
|
197
|
-
if (!isServer) {
|
|
198
|
-
Cookies.remove(COOKIE_SESSION_SIGN_IN);
|
|
199
|
-
window.location.href = loginPage;
|
|
200
|
-
}
|
|
201
|
-
throw err_3;
|
|
202
|
-
case 3: return [2 /*return*/];
|
|
203
|
-
}
|
|
204
|
-
});
|
|
205
|
-
}); };
|
|
206
209
|
export { PHXAxiosInstance };
|
|
207
210
|
//# 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,oBAAoB,EAAE,sBAAsB,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AACvH,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,
|
|
1
|
+
{"version":3,"file":"axiosInstance.js","sourceRoot":"","sources":["../../src/axiosInstance.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,14 +16,14 @@ export var PHXLoginV3 = function (props) {
|
|
|
16
16
|
var _c = useState(false), loading = _c[0], setLoading = _c[1];
|
|
17
17
|
var schoolLogo = getEnv('NEXT_PUBLIC_ENV_LOGIN_LOGO', process.env.NEXT_PUBLIC_ENV_LOGIN_LOGO);
|
|
18
18
|
var _d = useForm(), handleSubmit = _d.handleSubmit, register = _d.register, errors = _d.formState.errors;
|
|
19
|
-
|
|
19
|
+
var uri = getEnv('NEXT_PUBLIC_API_GATEWAY', process.env.NEXT_PUBLIC_API_GATEWAY);
|
|
20
20
|
var handleLogin = function (email, password) { return __awaiter(void 0, void 0, void 0, function () {
|
|
21
21
|
var response, error_1;
|
|
22
22
|
return __generator(this, function (_a) {
|
|
23
23
|
switch (_a.label) {
|
|
24
24
|
case 0:
|
|
25
25
|
_a.trys.push([0, 3, , 4]);
|
|
26
|
-
return [4 /*yield*/, fetch("
|
|
26
|
+
return [4 /*yield*/, fetch("".concat(uri, "/authen/login"), {
|
|
27
27
|
headers: {
|
|
28
28
|
'Content-Type': 'application/json'
|
|
29
29
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoginV3.js","sourceRoot":"","sources":["../../../../src/components/LoginV3/LoginV3.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAA;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAA;AAC9C,OAAO,iBAAiB,MAAM,2BAA2B,CAAA;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,UAAU,MAAM,eAAe,CAAA;AACtC,OAAO,uBAAuB,MAAM,0BAA0B,CAAA;AAU9D,MAAM,CAAC,IAAM,UAAU,GAAG,UAAC,KAAsB;IACvC,IAAA,IAAI,GAAgD,KAAK,KAArD,EAAE,MAAM,GAAwC,KAAK,OAA7C,EAAE,MAAM,GAAgC,KAAK,OAArC,EAAE,YAAY,GAAkB,KAAK,aAAvB,EAAE,WAAW,GAAK,KAAK,YAAV,CAAU;IAC3D,IAAA,KAA0B,QAAQ,CAAU,IAAI,CAAC,EAAhD,QAAQ,QAAA,EAAE,WAAW,QAA2B,CAAA;IACjD,IAAA,KAA8B,QAAQ,CAAU,KAAK,CAAC,EAArD,UAAU,QAAA,EAAE,aAAa,QAA4B,CAAA;IACtD,IAAA,KAAwB,QAAQ,CAAU,KAAK,CAAC,EAA/C,OAAO,QAAA,EAAE,UAAU,QAA4B,CAAA;IACtD,IAAM,UAAU,GAAG,MAAM,CAAC,4BAA4B,EAAE,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAA;IAEzF,IAAA,KAIF,OAAO,EAAE,EAHX,YAAY,kBAAA,EACZ,QAAQ,cAAA,EACK,MAAM,sBACR,CAAA;IAEb,
|
|
1
|
+
{"version":3,"file":"LoginV3.js","sourceRoot":"","sources":["../../../../src/components/LoginV3/LoginV3.tsx"],"names":[],"mappings":"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"}
|