phx-uikit 1.0.119 → 1.0.120
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/components/Func/axiosInstance.js +31 -25
- package/dist/cjs/components/Func/axiosInstance.js.map +1 -1
- package/dist/cjs/utils/constants.d.ts +1 -1
- package/dist/cjs/utils/constants.js +1 -1
- package/dist/cjs/utils/constants.js.map +1 -1
- package/dist/esm/components/Func/axiosInstance.js +32 -26
- package/dist/esm/components/Func/axiosInstance.js.map +1 -1
- package/dist/esm/utils/constants.d.ts +1 -1
- package/dist/esm/utils/constants.js +1 -1
- package/dist/esm/utils/constants.js.map +1 -1
- package/package.json +1 -1
|
@@ -25,21 +25,34 @@ var processQueue = function (error, token) {
|
|
|
25
25
|
var api = axios_1["default"].create({
|
|
26
26
|
baseURL: publicUrl
|
|
27
27
|
});
|
|
28
|
-
api.interceptors.request.use(function (config) {
|
|
29
|
-
var authTokenCookie
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
28
|
+
api.interceptors.request.use(function (config) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
29
|
+
var authTokenCookie, _a;
|
|
30
|
+
return tslib_1.__generator(this, function (_b) {
|
|
31
|
+
switch (_b.label) {
|
|
32
|
+
case 0:
|
|
33
|
+
_a = js_cookie_1["default"].get(constants_1.COOKIE_ACCESS_TOKEN);
|
|
34
|
+
if (_a) return [3 /*break*/, 2];
|
|
35
|
+
return [4 /*yield*/, convertAuthToken()];
|
|
36
|
+
case 1:
|
|
37
|
+
_a = (_b.sent());
|
|
38
|
+
_b.label = 2;
|
|
39
|
+
case 2:
|
|
40
|
+
authTokenCookie = _a;
|
|
41
|
+
if (authTokenCookie) {
|
|
42
|
+
config.headers.Authorization = "Bearer ".concat(authTokenCookie);
|
|
43
|
+
}
|
|
44
|
+
return [2 /*return*/, config];
|
|
45
|
+
}
|
|
46
|
+
});
|
|
47
|
+
}); });
|
|
35
48
|
api.interceptors.response.use(function (response) { return response; }, function (error) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
36
|
-
var originalRequest,
|
|
49
|
+
var originalRequest, data, newToken, err_1;
|
|
37
50
|
var _a;
|
|
38
51
|
return tslib_1.__generator(this, function (_b) {
|
|
39
52
|
switch (_b.label) {
|
|
40
53
|
case 0:
|
|
41
54
|
originalRequest = error.config;
|
|
42
|
-
if (!(((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === 401 && !originalRequest._retry)) return [3 /*break*/,
|
|
55
|
+
if (!(((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === 401 && !originalRequest._retry)) return [3 /*break*/, 5];
|
|
43
56
|
if (isRefreshing) {
|
|
44
57
|
return [2 /*return*/, new Promise(function (resolve, reject) {
|
|
45
58
|
failedQueue.push({
|
|
@@ -53,37 +66,30 @@ api.interceptors.response.use(function (response) { return response; }, function
|
|
|
53
66
|
}
|
|
54
67
|
originalRequest._retry = true;
|
|
55
68
|
isRefreshing = true;
|
|
56
|
-
newToken = void 0;
|
|
57
69
|
_b.label = 1;
|
|
58
70
|
case 1:
|
|
59
|
-
_b.trys.push([1,
|
|
60
|
-
return [4 /*yield*/, convertAuthToken()];
|
|
61
|
-
case 2:
|
|
62
|
-
newToken = _b.sent();
|
|
63
|
-
if (!!newToken) return [3 /*break*/, 4];
|
|
71
|
+
_b.trys.push([1, 3, 4, 5]);
|
|
64
72
|
return [4 /*yield*/, axios_1["default"].post("http://localhost:8100/authen/web/refresh-token", {}, {
|
|
65
73
|
withCredentials: true
|
|
66
74
|
})];
|
|
67
|
-
case
|
|
75
|
+
case 2:
|
|
68
76
|
data = (_b.sent()).data;
|
|
69
77
|
newToken = data.token;
|
|
70
|
-
_b.label = 4;
|
|
71
|
-
case 4:
|
|
72
78
|
(0, saveCookiesClient_1["default"])(constants_1.COOKIE_ACCESS_TOKEN, newToken, true);
|
|
73
79
|
processQueue(null, newToken);
|
|
74
80
|
originalRequest.headers.Authorization = 'Bearer ' + newToken;
|
|
75
81
|
return [2 /*return*/, api(originalRequest)];
|
|
76
|
-
case
|
|
82
|
+
case 3:
|
|
77
83
|
err_1 = _b.sent();
|
|
78
84
|
processQueue(err_1, null);
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
85
|
+
js_cookie_1["default"].remove(constants_1.COOKIE_ACCESS_TOKEN);
|
|
86
|
+
js_cookie_1["default"].remove(constants_1.COOKIE_REFRESH_TOKEN);
|
|
87
|
+
window.location.href = constants_1.loginPage;
|
|
82
88
|
return [2 /*return*/, Promise.reject(err_1)];
|
|
83
|
-
case
|
|
89
|
+
case 4:
|
|
84
90
|
isRefreshing = false;
|
|
85
91
|
return [7 /*endfinally*/];
|
|
86
|
-
case
|
|
92
|
+
case 5: return [2 /*return*/, Promise.reject(error)];
|
|
87
93
|
}
|
|
88
94
|
});
|
|
89
95
|
}); });
|
|
@@ -104,7 +110,7 @@ var convertAuthToken = function () { return tslib_1.__awaiter(void 0, void 0, vo
|
|
|
104
110
|
accessToken = data.token;
|
|
105
111
|
(0, saveCookiesClient_1["default"])(constants_1.COOKIE_ACCESS_TOKEN, accessToken, true);
|
|
106
112
|
js_cookie_1["default"].remove(TableVertical_1.AUTH_TOKEN);
|
|
107
|
-
return [2 /*return*/,
|
|
113
|
+
return [2 /*return*/, accessToken];
|
|
108
114
|
case 2:
|
|
109
115
|
e_1 = _a.sent();
|
|
110
116
|
console.log(e_1);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"axiosInstance.js","sourceRoot":"","sources":["../../../../src/components/Func/axiosInstance.ts"],"names":[],"mappings":";;;AAAA,wDAAyB;AACzB,gEAA+B;AAC/B,yDAA8C;AAC9C,
|
|
1
|
+
{"version":3,"file":"axiosInstance.js","sourceRoot":"","sources":["../../../../src/components/Func/axiosInstance.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ export declare const COOKIE_REFRESH_TOKEN = "refresh_token";
|
|
|
4
4
|
export declare const COOKIE_USER_INFO = "user_info";
|
|
5
5
|
export declare const COOKIE_SETTING_SITE = "setting_site";
|
|
6
6
|
export declare const COOKIE_ACTION_PERMISSION = "px_action_permission";
|
|
7
|
-
export declare const loginPage = "/login";
|
|
7
|
+
export declare const loginPage = "/login-sso";
|
|
8
8
|
export declare const admin = "admin";
|
|
9
9
|
export declare const superAdmin = "DEV";
|
|
10
10
|
export declare const switchSchool = "SWITCH";
|
|
@@ -7,7 +7,7 @@ exports.COOKIE_REFRESH_TOKEN = 'refresh_token';
|
|
|
7
7
|
exports.COOKIE_USER_INFO = 'user_info';
|
|
8
8
|
exports.COOKIE_SETTING_SITE = 'setting_site';
|
|
9
9
|
exports.COOKIE_ACTION_PERMISSION = 'px_action_permission';
|
|
10
|
-
exports.loginPage = '/login';
|
|
10
|
+
exports.loginPage = '/login-sso';
|
|
11
11
|
exports.admin = 'admin';
|
|
12
12
|
exports.superAdmin = 'DEV';
|
|
13
13
|
exports.switchSchool = 'SWITCH';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/utils/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,cAAc,GAAG,YAAY,CAAA;AAC7B,QAAA,mBAAmB,GAAG,cAAc,CAAA;AACpC,QAAA,oBAAoB,GAAG,eAAe,CAAA;AACtC,QAAA,gBAAgB,GAAG,WAAW,CAAA;AAC9B,QAAA,mBAAmB,GAAG,cAAc,CAAA;AACpC,QAAA,wBAAwB,GAAG,sBAAsB,CAAA;AAEjD,QAAA,SAAS,GAAG,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/utils/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,cAAc,GAAG,YAAY,CAAA;AAC7B,QAAA,mBAAmB,GAAG,cAAc,CAAA;AACpC,QAAA,oBAAoB,GAAG,eAAe,CAAA;AACtC,QAAA,gBAAgB,GAAG,WAAW,CAAA;AAC9B,QAAA,mBAAmB,GAAG,cAAc,CAAA;AACpC,QAAA,wBAAwB,GAAG,sBAAsB,CAAA;AAEjD,QAAA,SAAS,GAAG,YAAY,CAAA;AAExB,QAAA,KAAK,GAAG,OAAO,CAAA;AACf,QAAA,UAAU,GAAG,KAAK,CAAA;AAClB,QAAA,YAAY,GAAG,QAAQ,CAAA;AACvB,QAAA,cAAc,GAAG,YAAY,CAAA;AAC7B,QAAA,iBAAiB,GAAG,YAAY,CAAA;AAChC,QAAA,OAAO,GAAG,IAAI,CAAA;AACd,QAAA,mBAAmB,GAAG,GAAG,CAAA;AACzB,QAAA,YAAY,GAAG,IAAI,CAAA;AAEnB,QAAA,cAAc,GAAG,qFAAqF,CAAA;AACtG,QAAA,kBAAkB,GAAG,6EAA6E,CAAA;AAClG,QAAA,sBAAsB,GAAG,6EAA6E,CAAA;AAEtG,QAAA,kBAAkB,GAAG,SAAS,CAAA;AAC9B,QAAA,iBAAiB,GAAG,SAAS,CAAA;AAC7B,QAAA,oBAAoB,GAAG,SAAS,CAAA;AAChC,QAAA,kBAAkB,GAAG,SAAS,CAAA;AAC9B,QAAA,sBAAsB,GAAG,SAAS,CAAA;AAClC,QAAA,4BAA4B,GAAG,SAAS,CAAA;AACxC,QAAA,oBAAoB,GAAG,SAAS,CAAA;AAEhC,QAAA,gBAAgB,GAAG,SAAS,CAAA;AAC5B,QAAA,kBAAkB,GAAG,SAAS,CAAA;AAC9B,QAAA,uBAAuB,GAAG,MAAM,CAAA;AAChC,QAAA,kBAAkB,GAAG,SAAS,CAAA;AAC9B,QAAA,wBAAwB,GAAG,SAAS,CAAA;AACpC,QAAA,iCAAiC,GAAG,SAAS,CAAA;AAC7C,QAAA,yBAAyB,GAAG,SAAS,CAAA;AACrC,QAAA,sBAAsB,GAAG,MAAM,CAAA;AAE/B,QAAA,mBAAmB,GAAG,iBAAiB,CAAA;AACvC,QAAA,kBAAkB,GAAG,gBAAgB,CAAA;AACrC,QAAA,mBAAmB,GAAG,iBAAiB,CAAA;AAEvC,QAAA,UAAU,GAAG,KAAK,CAAA;AAClB,QAAA,UAAU,GAAG,KAAK,CAAA;AAElB,QAAA,oBAAoB,GAAG,KAAK,CAAA,CAAC,UAAU;AACvC,QAAA,oBAAoB,GAAG,KAAK,CAAA,CAAC,WAAW;AACxC,QAAA,aAAa,GAAG,eAAe,CAAA;AAE5C,4BAA4B;AACf,QAAA,YAAY,GAAG,UAAU,CAAA;AAEzB,QAAA,0BAA0B,GAAG,CAAC,CAAA;AAC9B,QAAA,2BAA2B,GAAG,CAAC,CAAA;AAE/B,QAAA,SAAS,GAAG,EAAE,CAAA;AACd,QAAA,UAAU,GAAG,kEAAkE,CAAA;AAC/E,QAAA,kBAAkB,GAAG,CAAC,CAAA,CAAC,eAAe"}
|
|
@@ -2,7 +2,7 @@ import { __awaiter, __generator } from "tslib";
|
|
|
2
2
|
import axios from 'axios';
|
|
3
3
|
import Cookies from 'js-cookie';
|
|
4
4
|
import { getEnv } from '../../read-env-config';
|
|
5
|
-
import { COOKIE_ACCESS_TOKEN } from '../../utils/constants';
|
|
5
|
+
import { COOKIE_ACCESS_TOKEN, COOKIE_REFRESH_TOKEN, loginPage } from '../../utils/constants';
|
|
6
6
|
import saveCookiesClient from './saveCookiesClient';
|
|
7
7
|
import { AUTH_TOKEN } from '../TableVertical';
|
|
8
8
|
var isRefreshing = false;
|
|
@@ -23,21 +23,34 @@ var processQueue = function (error, token) {
|
|
|
23
23
|
var api = axios.create({
|
|
24
24
|
baseURL: publicUrl
|
|
25
25
|
});
|
|
26
|
-
api.interceptors.request.use(function (config) {
|
|
27
|
-
var authTokenCookie
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
26
|
+
api.interceptors.request.use(function (config) { return __awaiter(void 0, void 0, void 0, function () {
|
|
27
|
+
var authTokenCookie, _a;
|
|
28
|
+
return __generator(this, function (_b) {
|
|
29
|
+
switch (_b.label) {
|
|
30
|
+
case 0:
|
|
31
|
+
_a = Cookies.get(COOKIE_ACCESS_TOKEN);
|
|
32
|
+
if (_a) return [3 /*break*/, 2];
|
|
33
|
+
return [4 /*yield*/, convertAuthToken()];
|
|
34
|
+
case 1:
|
|
35
|
+
_a = (_b.sent());
|
|
36
|
+
_b.label = 2;
|
|
37
|
+
case 2:
|
|
38
|
+
authTokenCookie = _a;
|
|
39
|
+
if (authTokenCookie) {
|
|
40
|
+
config.headers.Authorization = "Bearer ".concat(authTokenCookie);
|
|
41
|
+
}
|
|
42
|
+
return [2 /*return*/, config];
|
|
43
|
+
}
|
|
44
|
+
});
|
|
45
|
+
}); });
|
|
33
46
|
api.interceptors.response.use(function (response) { return response; }, function (error) { return __awaiter(void 0, void 0, void 0, function () {
|
|
34
|
-
var originalRequest,
|
|
47
|
+
var originalRequest, data, newToken, err_1;
|
|
35
48
|
var _a;
|
|
36
49
|
return __generator(this, function (_b) {
|
|
37
50
|
switch (_b.label) {
|
|
38
51
|
case 0:
|
|
39
52
|
originalRequest = error.config;
|
|
40
|
-
if (!(((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === 401 && !originalRequest._retry)) return [3 /*break*/,
|
|
53
|
+
if (!(((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === 401 && !originalRequest._retry)) return [3 /*break*/, 5];
|
|
41
54
|
if (isRefreshing) {
|
|
42
55
|
return [2 /*return*/, new Promise(function (resolve, reject) {
|
|
43
56
|
failedQueue.push({
|
|
@@ -51,37 +64,30 @@ api.interceptors.response.use(function (response) { return response; }, function
|
|
|
51
64
|
}
|
|
52
65
|
originalRequest._retry = true;
|
|
53
66
|
isRefreshing = true;
|
|
54
|
-
newToken = void 0;
|
|
55
67
|
_b.label = 1;
|
|
56
68
|
case 1:
|
|
57
|
-
_b.trys.push([1,
|
|
58
|
-
return [4 /*yield*/, convertAuthToken()];
|
|
59
|
-
case 2:
|
|
60
|
-
newToken = _b.sent();
|
|
61
|
-
if (!!newToken) return [3 /*break*/, 4];
|
|
69
|
+
_b.trys.push([1, 3, 4, 5]);
|
|
62
70
|
return [4 /*yield*/, axios.post("http://localhost:8100/authen/web/refresh-token", {}, {
|
|
63
71
|
withCredentials: true
|
|
64
72
|
})];
|
|
65
|
-
case
|
|
73
|
+
case 2:
|
|
66
74
|
data = (_b.sent()).data;
|
|
67
75
|
newToken = data.token;
|
|
68
|
-
_b.label = 4;
|
|
69
|
-
case 4:
|
|
70
76
|
saveCookiesClient(COOKIE_ACCESS_TOKEN, newToken, true);
|
|
71
77
|
processQueue(null, newToken);
|
|
72
78
|
originalRequest.headers.Authorization = 'Bearer ' + newToken;
|
|
73
79
|
return [2 /*return*/, api(originalRequest)];
|
|
74
|
-
case
|
|
80
|
+
case 3:
|
|
75
81
|
err_1 = _b.sent();
|
|
76
82
|
processQueue(err_1, null);
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
83
|
+
Cookies.remove(COOKIE_ACCESS_TOKEN);
|
|
84
|
+
Cookies.remove(COOKIE_REFRESH_TOKEN);
|
|
85
|
+
window.location.href = loginPage;
|
|
80
86
|
return [2 /*return*/, Promise.reject(err_1)];
|
|
81
|
-
case
|
|
87
|
+
case 4:
|
|
82
88
|
isRefreshing = false;
|
|
83
89
|
return [7 /*endfinally*/];
|
|
84
|
-
case
|
|
90
|
+
case 5: return [2 /*return*/, Promise.reject(error)];
|
|
85
91
|
}
|
|
86
92
|
});
|
|
87
93
|
}); });
|
|
@@ -102,7 +108,7 @@ var convertAuthToken = function () { return __awaiter(void 0, void 0, void 0, fu
|
|
|
102
108
|
accessToken = data.token;
|
|
103
109
|
saveCookiesClient(COOKIE_ACCESS_TOKEN, accessToken, true);
|
|
104
110
|
Cookies.remove(AUTH_TOKEN);
|
|
105
|
-
return [2 /*return*/,
|
|
111
|
+
return [2 /*return*/, accessToken];
|
|
106
112
|
case 2:
|
|
107
113
|
e_1 = _a.sent();
|
|
108
114
|
console.log(e_1);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"axiosInstance.js","sourceRoot":"","sources":["../../../../src/components/Func/axiosInstance.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,OAAO,MAAM,WAAW,CAAA;AAC/B,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAA;AAC9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;
|
|
1
|
+
{"version":3,"file":"axiosInstance.js","sourceRoot":"","sources":["../../../../src/components/Func/axiosInstance.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ export declare const COOKIE_REFRESH_TOKEN = "refresh_token";
|
|
|
4
4
|
export declare const COOKIE_USER_INFO = "user_info";
|
|
5
5
|
export declare const COOKIE_SETTING_SITE = "setting_site";
|
|
6
6
|
export declare const COOKIE_ACTION_PERMISSION = "px_action_permission";
|
|
7
|
-
export declare const loginPage = "/login";
|
|
7
|
+
export declare const loginPage = "/login-sso";
|
|
8
8
|
export declare const admin = "admin";
|
|
9
9
|
export declare const superAdmin = "DEV";
|
|
10
10
|
export declare const switchSchool = "SWITCH";
|
|
@@ -4,7 +4,7 @@ export var COOKIE_REFRESH_TOKEN = 'refresh_token';
|
|
|
4
4
|
export var COOKIE_USER_INFO = 'user_info';
|
|
5
5
|
export var COOKIE_SETTING_SITE = 'setting_site';
|
|
6
6
|
export var COOKIE_ACTION_PERMISSION = 'px_action_permission';
|
|
7
|
-
export var loginPage = '/login';
|
|
7
|
+
export var loginPage = '/login-sso';
|
|
8
8
|
export var admin = 'admin';
|
|
9
9
|
export var superAdmin = 'DEV';
|
|
10
10
|
export var switchSchool = 'SWITCH';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/utils/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,IAAM,cAAc,GAAG,YAAY,CAAA;AAC1C,MAAM,CAAC,IAAM,mBAAmB,GAAG,cAAc,CAAA;AACjD,MAAM,CAAC,IAAM,oBAAoB,GAAG,eAAe,CAAA;AACnD,MAAM,CAAC,IAAM,gBAAgB,GAAG,WAAW,CAAA;AAC3C,MAAM,CAAC,IAAM,mBAAmB,GAAG,cAAc,CAAA;AACjD,MAAM,CAAC,IAAM,wBAAwB,GAAG,sBAAsB,CAAA;AAE9D,MAAM,CAAC,IAAM,SAAS,GAAG,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/utils/constants.ts"],"names":[],"mappings":"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"}
|