phx-uikit 1.0.205 → 1.0.207
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 +21 -24
- package/dist/cjs/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/axiosInstance.js +22 -25
- package/dist/esm/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
|
@@ -50,18 +50,17 @@ var getAuthHeaders = function () {
|
|
|
50
50
|
return {};
|
|
51
51
|
};
|
|
52
52
|
var refreshAccessToken = function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
53
|
-
var response, newToken, currentSession,
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
switch (_b.label) {
|
|
53
|
+
var response, newToken, currentSession, err_1;
|
|
54
|
+
return tslib_1.__generator(this, function (_a) {
|
|
55
|
+
switch (_a.label) {
|
|
57
56
|
case 0:
|
|
58
|
-
|
|
57
|
+
_a.trys.push([0, 2, , 3]);
|
|
59
58
|
return [4 /*yield*/, axios_1["default"].post("".concat(isServer ? (0, headers_1.headers)().get('origin') : '', "/api/authenticate/refresh-token"), {}, {
|
|
60
59
|
headers: getAuthHeaders(),
|
|
61
60
|
withCredentials: true
|
|
62
61
|
})];
|
|
63
62
|
case 1:
|
|
64
|
-
response =
|
|
63
|
+
response = _a.sent();
|
|
65
64
|
newToken = response.data.token;
|
|
66
65
|
currentSession = (0, getCookieSession_1["default"])();
|
|
67
66
|
(0, saveCookiesClient_1["default"])({ value: tslib_1.__assign(tslib_1.__assign({}, currentSession), { access_token: newToken }) });
|
|
@@ -70,15 +69,12 @@ var refreshAccessToken = function () { return tslib_1.__awaiter(void 0, void 0,
|
|
|
70
69
|
localStorage.removeItem(constants_1.isLoggedCookie);
|
|
71
70
|
}
|
|
72
71
|
else {
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
status: response.status,
|
|
76
|
-
headers: tslib_1.__assign({ 'Content-Type': response.headers['content-type'] || 'application/json' }, (setCookie ? { 'set-cookie': setCookie } : {}))
|
|
77
|
-
})];
|
|
72
|
+
// save refresh token from server site
|
|
73
|
+
saveRefreshTokenServer(response);
|
|
78
74
|
}
|
|
79
75
|
return [2 /*return*/, newToken];
|
|
80
76
|
case 2:
|
|
81
|
-
err_1 =
|
|
77
|
+
err_1 = _a.sent();
|
|
82
78
|
if (!isServer) {
|
|
83
79
|
js_cookie_1["default"].remove(constants_1.COOKIE_SESSION_SIGN_IN);
|
|
84
80
|
window.location.href = constants_1.loginPage;
|
|
@@ -88,18 +84,19 @@ var refreshAccessToken = function () { return tslib_1.__awaiter(void 0, void 0,
|
|
|
88
84
|
}
|
|
89
85
|
});
|
|
90
86
|
}); };
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
87
|
+
var saveRefreshTokenServer = function (response) {
|
|
88
|
+
var _a;
|
|
89
|
+
var setCookieHeader = ((_a = response.headers['set-cookie']) === null || _a === void 0 ? void 0 : _a[0]) || '';
|
|
90
|
+
var match = setCookieHeader.match(/refresh_token=([^;]+)/);
|
|
91
|
+
var refreshToken = (match === null || match === void 0 ? void 0 : match[1]) || '';
|
|
92
|
+
(0, headers_1.cookies)().set(constants_1.COOKIE_REFRESH_TOKEN, refreshToken, {
|
|
93
|
+
path: '/',
|
|
94
|
+
httpOnly: true,
|
|
95
|
+
secure: true,
|
|
96
|
+
sameSite: 'none',
|
|
97
|
+
expires: new Date(Date.now() + 365 * 24 * 60 * 60 * 1000)
|
|
98
|
+
});
|
|
99
|
+
};
|
|
103
100
|
PHXAxiosInstance.interceptors.request.use(function (config) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
104
101
|
var currentSession, authTokenCookie, err_2, newToken;
|
|
105
102
|
var _a;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"axiosInstance.js","sourceRoot":"","sources":["../../src/axiosInstance.ts"],"names":[],"mappings":";;;;AAAA,wDAAyB;AACzB,gEAA+B;AAC/B,qDAA0C;AAC1C,+
|
|
1
|
+
{"version":3,"file":"axiosInstance.js","sourceRoot":"","sources":["../../src/axiosInstance.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export declare const isLoggedCookie = "isLoggedIn";
|
|
2
2
|
export declare const AUTH_TOKEN = "authToken";
|
|
3
3
|
export declare const COOKIE_SESSION_SIGN_IN = "phx_session";
|
|
4
|
-
export declare const COOKIE_REFRESH_TOKEN = "
|
|
4
|
+
export declare const COOKIE_REFRESH_TOKEN = "phx_rf_token";
|
|
5
5
|
export declare const loginPage = "/login-sso";
|
|
6
6
|
export declare const ROUTE_DASHBOARD = "/dashboard";
|
|
7
7
|
export declare const admin = "admin";
|
|
@@ -4,7 +4,7 @@ exports.KEY_COOKIE_NOT_USE = exports.requestMaxDuration = exports.SECRET_KEY = e
|
|
|
4
4
|
exports.isLoggedCookie = 'isLoggedIn';
|
|
5
5
|
exports.AUTH_TOKEN = 'authToken';
|
|
6
6
|
exports.COOKIE_SESSION_SIGN_IN = 'phx_session';
|
|
7
|
-
exports.COOKIE_REFRESH_TOKEN = '
|
|
7
|
+
exports.COOKIE_REFRESH_TOKEN = 'phx_rf_token';
|
|
8
8
|
exports.loginPage = '/login-sso';
|
|
9
9
|
exports.ROUTE_DASHBOARD = '/dashboard';
|
|
10
10
|
exports.admin = 'admin';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/utils/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,cAAc,GAAG,YAAY,CAAA;AAC7B,QAAA,UAAU,GAAG,WAAW,CAAA;AACxB,QAAA,sBAAsB,GAAG,aAAa,CAAA;AACtC,QAAA,oBAAoB,GAAG,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/utils/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,cAAc,GAAG,YAAY,CAAA;AAC7B,QAAA,UAAU,GAAG,WAAW,CAAA;AACxB,QAAA,sBAAsB,GAAG,aAAa,CAAA;AACtC,QAAA,oBAAoB,GAAG,cAAc,CAAA;AACrC,QAAA,SAAS,GAAG,YAAY,CAAA;AACxB,QAAA,eAAe,GAAG,YAAY,CAAA;AAE9B,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;AAEnD,aAAa;AACA,QAAA,kBAAkB,GAAG;IAChC,iCAAiC;IACjC,oCAAoC;IACpC,oCAAoC;CACrC,CAAA"}
|
|
@@ -2,7 +2,7 @@ import { __assign, __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 { AUTH_TOKEN, COOKIE_SESSION_SIGN_IN, isLoggedCookie, loginPage } from './utils/constants';
|
|
5
|
+
import { AUTH_TOKEN, COOKIE_REFRESH_TOKEN, COOKIE_SESSION_SIGN_IN, isLoggedCookie, loginPage } from './utils/constants';
|
|
6
6
|
import saveCookiesClient from './components/Func/saveCookiesClient';
|
|
7
7
|
import PHXFuncGetCookieSession from './components/Func/getCookieSession';
|
|
8
8
|
import { cookies, headers } from 'next/headers';
|
|
@@ -46,18 +46,17 @@ var getAuthHeaders = function () {
|
|
|
46
46
|
return {};
|
|
47
47
|
};
|
|
48
48
|
var refreshAccessToken = function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
49
|
-
var response, newToken, currentSession,
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
switch (_b.label) {
|
|
49
|
+
var response, newToken, currentSession, err_1;
|
|
50
|
+
return __generator(this, function (_a) {
|
|
51
|
+
switch (_a.label) {
|
|
53
52
|
case 0:
|
|
54
|
-
|
|
53
|
+
_a.trys.push([0, 2, , 3]);
|
|
55
54
|
return [4 /*yield*/, axios.post("".concat(isServer ? headers().get('origin') : '', "/api/authenticate/refresh-token"), {}, {
|
|
56
55
|
headers: getAuthHeaders(),
|
|
57
56
|
withCredentials: true
|
|
58
57
|
})];
|
|
59
58
|
case 1:
|
|
60
|
-
response =
|
|
59
|
+
response = _a.sent();
|
|
61
60
|
newToken = response.data.token;
|
|
62
61
|
currentSession = PHXFuncGetCookieSession();
|
|
63
62
|
saveCookiesClient({ value: __assign(__assign({}, currentSession), { access_token: newToken }) });
|
|
@@ -66,15 +65,12 @@ var refreshAccessToken = function () { return __awaiter(void 0, void 0, void 0,
|
|
|
66
65
|
localStorage.removeItem(isLoggedCookie);
|
|
67
66
|
}
|
|
68
67
|
else {
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
status: response.status,
|
|
72
|
-
headers: __assign({ 'Content-Type': response.headers['content-type'] || 'application/json' }, (setCookie ? { 'set-cookie': setCookie } : {}))
|
|
73
|
-
})];
|
|
68
|
+
// save refresh token from server site
|
|
69
|
+
saveRefreshTokenServer(response);
|
|
74
70
|
}
|
|
75
71
|
return [2 /*return*/, newToken];
|
|
76
72
|
case 2:
|
|
77
|
-
err_1 =
|
|
73
|
+
err_1 = _a.sent();
|
|
78
74
|
if (!isServer) {
|
|
79
75
|
Cookies.remove(COOKIE_SESSION_SIGN_IN);
|
|
80
76
|
window.location.href = loginPage;
|
|
@@ -84,18 +80,19 @@ var refreshAccessToken = function () { return __awaiter(void 0, void 0, void 0,
|
|
|
84
80
|
}
|
|
85
81
|
});
|
|
86
82
|
}); };
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
83
|
+
var saveRefreshTokenServer = function (response) {
|
|
84
|
+
var _a;
|
|
85
|
+
var setCookieHeader = ((_a = response.headers['set-cookie']) === null || _a === void 0 ? void 0 : _a[0]) || '';
|
|
86
|
+
var match = setCookieHeader.match(/refresh_token=([^;]+)/);
|
|
87
|
+
var refreshToken = (match === null || match === void 0 ? void 0 : match[1]) || '';
|
|
88
|
+
cookies().set(COOKIE_REFRESH_TOKEN, refreshToken, {
|
|
89
|
+
path: '/',
|
|
90
|
+
httpOnly: true,
|
|
91
|
+
secure: true,
|
|
92
|
+
sameSite: 'none',
|
|
93
|
+
expires: new Date(Date.now() + 365 * 24 * 60 * 60 * 1000)
|
|
94
|
+
});
|
|
95
|
+
};
|
|
99
96
|
PHXAxiosInstance.interceptors.request.use(function (config) { return __awaiter(void 0, void 0, void 0, function () {
|
|
100
97
|
var currentSession, authTokenCookie, err_2, newToken;
|
|
101
98
|
var _a;
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"axiosInstance.js","sourceRoot":"","sources":["../../src/axiosInstance.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export declare const isLoggedCookie = "isLoggedIn";
|
|
2
2
|
export declare const AUTH_TOKEN = "authToken";
|
|
3
3
|
export declare const COOKIE_SESSION_SIGN_IN = "phx_session";
|
|
4
|
-
export declare const COOKIE_REFRESH_TOKEN = "
|
|
4
|
+
export declare const COOKIE_REFRESH_TOKEN = "phx_rf_token";
|
|
5
5
|
export declare const loginPage = "/login-sso";
|
|
6
6
|
export declare const ROUTE_DASHBOARD = "/dashboard";
|
|
7
7
|
export declare const admin = "admin";
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export var isLoggedCookie = 'isLoggedIn';
|
|
2
2
|
export var AUTH_TOKEN = 'authToken';
|
|
3
3
|
export var COOKIE_SESSION_SIGN_IN = 'phx_session';
|
|
4
|
-
export var COOKIE_REFRESH_TOKEN = '
|
|
4
|
+
export var COOKIE_REFRESH_TOKEN = 'phx_rf_token';
|
|
5
5
|
export var loginPage = '/login-sso';
|
|
6
6
|
export var ROUTE_DASHBOARD = '/dashboard';
|
|
7
7
|
export var admin = 'admin';
|
|
@@ -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,UAAU,GAAG,WAAW,CAAA;AACrC,MAAM,CAAC,IAAM,sBAAsB,GAAG,aAAa,CAAA;AACnD,MAAM,CAAC,IAAM,oBAAoB,GAAG,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/utils/constants.ts"],"names":[],"mappings":"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"}
|