phx-react 1.3.936 → 1.3.937
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 +2 -7
- package/dist/cjs/axiosInstance.js.map +1 -1
- package/dist/cjs/components/Func/getLoginInfo.js +1 -16
- package/dist/cjs/components/Func/getLoginInfo.js.map +1 -1
- package/dist/cjs/utils/constants.d.ts +0 -2
- package/dist/cjs/utils/constants.js +1 -3
- package/dist/cjs/utils/constants.js.map +1 -1
- package/dist/esm/axiosInstance.js +3 -8
- package/dist/esm/axiosInstance.js.map +1 -1
- package/dist/esm/components/Func/getLoginInfo.js +1 -17
- package/dist/esm/components/Func/getLoginInfo.js.map +1 -1
- package/dist/esm/utils/constants.d.ts +0 -2
- package/dist/esm/utils/constants.js +0 -2
- package/dist/esm/utils/constants.js.map +1 -1
- package/package.json +1 -1
|
@@ -3,7 +3,6 @@ exports.__esModule = true;
|
|
|
3
3
|
exports.PHXAxiosInstance = void 0;
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
5
|
var axios_1 = tslib_1.__importDefault(require("axios"));
|
|
6
|
-
var js_cookie_1 = tslib_1.__importDefault(require("js-cookie"));
|
|
7
6
|
var read_env_config_1 = require("./read-env-config");
|
|
8
7
|
var constants_1 = require("./utils/constants");
|
|
9
8
|
var saveCookiesClient_1 = tslib_1.__importDefault(require("./components/Func/saveCookiesClient"));
|
|
@@ -62,11 +61,7 @@ var refreshAccessToken = function () { return tslib_1.__awaiter(void 0, void 0,
|
|
|
62
61
|
newToken = response.data.token;
|
|
63
62
|
currentSession = (0, getCookieSession_1["default"])();
|
|
64
63
|
(0, saveCookiesClient_1["default"])({ value: tslib_1.__assign(tslib_1.__assign({}, currentSession), { access_token: newToken }) });
|
|
65
|
-
if (
|
|
66
|
-
js_cookie_1["default"].remove(constants_1.AUTH_TOKEN);
|
|
67
|
-
localStorage.removeItem(constants_1.isLoggedCookie);
|
|
68
|
-
}
|
|
69
|
-
else {
|
|
64
|
+
if (isServer) {
|
|
70
65
|
// save refresh token from server site
|
|
71
66
|
saveRefreshTokenServer(response);
|
|
72
67
|
}
|
|
@@ -74,7 +69,7 @@ var refreshAccessToken = function () { return tslib_1.__awaiter(void 0, void 0,
|
|
|
74
69
|
case 2:
|
|
75
70
|
err_1 = _a.sent();
|
|
76
71
|
if (!isServer) {
|
|
77
|
-
|
|
72
|
+
// Cookies.remove(COOKIE_SESSION_SIGN_IN)
|
|
78
73
|
window.location.href = constants_1.loginPage;
|
|
79
74
|
}
|
|
80
75
|
throw err_1;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"axiosInstance.js","sourceRoot":"","sources":["../../src/axiosInstance.ts"],"names":[],"mappings":";;;;AAAA,wDAAyB;AACzB,
|
|
1
|
+
{"version":3,"file":"axiosInstance.js","sourceRoot":"","sources":["../../src/axiosInstance.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,26 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
exports.__esModule = true;
|
|
3
3
|
var tslib_1 = require("tslib");
|
|
4
|
-
var constants_1 = require("../../utils/constants");
|
|
5
|
-
var saveCookiesClient_1 = tslib_1.__importDefault(require("./saveCookiesClient"));
|
|
6
4
|
var getCookieSession_1 = tslib_1.__importDefault(require("./getCookieSession"));
|
|
7
5
|
function PHXFuncGetLoggedInfo() {
|
|
8
6
|
var cookieSession = (0, getCookieSession_1["default"])();
|
|
9
7
|
var userInfo = cookieSession === null || cookieSession === void 0 ? void 0 : cookieSession.user_info;
|
|
10
|
-
|
|
11
|
-
return userInfo;
|
|
12
|
-
// convert data localStorage to cookie
|
|
13
|
-
if (typeof window !== 'undefined') {
|
|
14
|
-
var loggedInfoString = localStorage.getItem(constants_1.isLoggedCookie);
|
|
15
|
-
if (loggedInfoString) {
|
|
16
|
-
// convert data to save cookie
|
|
17
|
-
var userInfo_1 = JSON.parse(loggedInfoString);
|
|
18
|
-
(0, saveCookiesClient_1["default"])({ value: tslib_1.__assign(tslib_1.__assign({}, cookieSession), { user_info: userInfo_1 }) });
|
|
19
|
-
localStorage.removeItem(constants_1.isLoggedCookie);
|
|
20
|
-
return userInfo_1;
|
|
21
|
-
}
|
|
22
|
-
}
|
|
23
|
-
return null;
|
|
8
|
+
return userInfo || null;
|
|
24
9
|
}
|
|
25
10
|
exports["default"] = PHXFuncGetLoggedInfo;
|
|
26
11
|
//# sourceMappingURL=getLoginInfo.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getLoginInfo.js","sourceRoot":"","sources":["../../../../src/components/Func/getLoginInfo.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"getLoginInfo.js","sourceRoot":"","sources":["../../../../src/components/Func/getLoginInfo.ts"],"names":[],"mappings":";;;AAAA,gFAAsE;AAEtE,SAAwB,oBAAoB;IAC1C,IAAM,aAAa,GAAG,IAAA,6BAAuB,GAAE,CAAA;IAC/C,IAAM,QAAQ,GAAG,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,SAAS,CAAA;IACzC,OAAO,QAAQ,IAAI,IAAI,CAAA;AACzB,CAAC;AAJD,0CAIC"}
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
export declare const isLoggedCookie = "isLoggedIn";
|
|
2
|
-
export declare const AUTH_TOKEN = "authToken";
|
|
3
1
|
export declare const COOKIE_SESSION_SIGN_IN = "phx_session";
|
|
4
2
|
export declare const COOKIE_REFRESH_TOKEN = "refresh_token";
|
|
5
3
|
export declare const loginPage = "/login-sso";
|
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
exports.__esModule = true;
|
|
3
|
-
exports.KEY_COOKIE_NOT_USE = exports.requestMaxDuration = exports.SECRET_KEY = exports.IV_LENGTH = exports.KEY_COEFFICIENT_SEMESTER_II = exports.KEY_COEFFICIENT_SEMESTER_I = exports.SIZE_DEFAULT = exports.AUTHENTICATED = exports.BUS_SERVICE_TYPE_BUS = exports.BUS_SERVICE_TYPE_BTN = exports.PARENT_MOM = exports.PARENT_DAD = exports.KEY_PROFILE_TEACHER = exports.KEY_PARENT_STUDENT = exports.KEY_PROFILE_STUDENT = exports.DF_MENU_HOVER_BG_COLOR = exports.DF_MENU_ICON_ACTICE_COLOR = exports.DF_MENU_ICON_AND_TEXT_HOVER_COLOR = exports.DF_MENU_ICON_HOVER_COLOR = exports.DF_MENU_ICON_COLOR = exports.DF_MENU_BG_ACTIVE_COLOR = exports.DF_MENU_TEXT_COLOR = exports.DF_MENU_BG_COLOR = exports.DF_SEARCH_TEXT_COLOR = exports.DF_SEARCH_BORDER_HOVER_COLOR = exports.DF_SEARCH_BORDER_COLOR = exports.DF_SEARCH_BG_COLOR = exports.DF_SEARCH_ICON_COLOR = exports.DF_SKELETON_COLOR = exports.DF_HEADER_BG_COLOR = exports.DEFAULT_LOGO_DASHBOARD = exports.DEFAULT_LOGO_LOGIN = exports.DEFAULT_AVATAR = exports.ROLE_TEACHER = exports.TEACHER_TYPE_LEADER = exports.ROLE_SV = exports.KEY_QUERY_SETTING = exports.KEY_LOGIN_LOGO = exports.switchSchool = exports.superAdmin = exports.admin = exports.ROUTE_DASHBOARD = exports.loginPage = exports.COOKIE_REFRESH_TOKEN = exports.COOKIE_SESSION_SIGN_IN =
|
|
4
|
-
exports.isLoggedCookie = 'isLoggedIn';
|
|
5
|
-
exports.AUTH_TOKEN = 'authToken';
|
|
3
|
+
exports.KEY_COOKIE_NOT_USE = exports.requestMaxDuration = exports.SECRET_KEY = exports.IV_LENGTH = exports.KEY_COEFFICIENT_SEMESTER_II = exports.KEY_COEFFICIENT_SEMESTER_I = exports.SIZE_DEFAULT = exports.AUTHENTICATED = exports.BUS_SERVICE_TYPE_BUS = exports.BUS_SERVICE_TYPE_BTN = exports.PARENT_MOM = exports.PARENT_DAD = exports.KEY_PROFILE_TEACHER = exports.KEY_PARENT_STUDENT = exports.KEY_PROFILE_STUDENT = exports.DF_MENU_HOVER_BG_COLOR = exports.DF_MENU_ICON_ACTICE_COLOR = exports.DF_MENU_ICON_AND_TEXT_HOVER_COLOR = exports.DF_MENU_ICON_HOVER_COLOR = exports.DF_MENU_ICON_COLOR = exports.DF_MENU_BG_ACTIVE_COLOR = exports.DF_MENU_TEXT_COLOR = exports.DF_MENU_BG_COLOR = exports.DF_SEARCH_TEXT_COLOR = exports.DF_SEARCH_BORDER_HOVER_COLOR = exports.DF_SEARCH_BORDER_COLOR = exports.DF_SEARCH_BG_COLOR = exports.DF_SEARCH_ICON_COLOR = exports.DF_SKELETON_COLOR = exports.DF_HEADER_BG_COLOR = exports.DEFAULT_LOGO_DASHBOARD = exports.DEFAULT_LOGO_LOGIN = exports.DEFAULT_AVATAR = exports.ROLE_TEACHER = exports.TEACHER_TYPE_LEADER = exports.ROLE_SV = exports.KEY_QUERY_SETTING = exports.KEY_LOGIN_LOGO = exports.switchSchool = exports.superAdmin = exports.admin = exports.ROUTE_DASHBOARD = exports.loginPage = exports.COOKIE_REFRESH_TOKEN = exports.COOKIE_SESSION_SIGN_IN = void 0;
|
|
6
4
|
exports.COOKIE_SESSION_SIGN_IN = 'phx_session';
|
|
7
5
|
exports.COOKIE_REFRESH_TOKEN = 'refresh_token';
|
|
8
6
|
exports.loginPage = '/login-sso';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/utils/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/utils/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,sBAAsB,GAAG,aAAa,CAAA;AACtC,QAAA,oBAAoB,GAAG,eAAe,CAAA;AACtC,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"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import { __assign, __awaiter, __generator } from "tslib";
|
|
2
2
|
import axios from 'axios';
|
|
3
|
-
import Cookies from 'js-cookie';
|
|
4
3
|
import { getEnv } from './read-env-config';
|
|
5
|
-
import {
|
|
4
|
+
import { COOKIE_REFRESH_TOKEN, loginPage } from './utils/constants';
|
|
6
5
|
import saveCookiesClient from './components/Func/saveCookiesClient';
|
|
7
6
|
import PHXFuncGetCookieSession from './components/Func/getCookieSession';
|
|
8
7
|
import { cookies, headers } from 'next/headers';
|
|
@@ -58,11 +57,7 @@ var refreshAccessToken = function () { return __awaiter(void 0, void 0, void 0,
|
|
|
58
57
|
newToken = response.data.token;
|
|
59
58
|
currentSession = PHXFuncGetCookieSession();
|
|
60
59
|
saveCookiesClient({ value: __assign(__assign({}, currentSession), { access_token: newToken }) });
|
|
61
|
-
if (
|
|
62
|
-
Cookies.remove(AUTH_TOKEN);
|
|
63
|
-
localStorage.removeItem(isLoggedCookie);
|
|
64
|
-
}
|
|
65
|
-
else {
|
|
60
|
+
if (isServer) {
|
|
66
61
|
// save refresh token from server site
|
|
67
62
|
saveRefreshTokenServer(response);
|
|
68
63
|
}
|
|
@@ -70,7 +65,7 @@ var refreshAccessToken = function () { return __awaiter(void 0, void 0, void 0,
|
|
|
70
65
|
case 2:
|
|
71
66
|
err_1 = _a.sent();
|
|
72
67
|
if (!isServer) {
|
|
73
|
-
Cookies.remove(COOKIE_SESSION_SIGN_IN)
|
|
68
|
+
// Cookies.remove(COOKIE_SESSION_SIGN_IN)
|
|
74
69
|
window.location.href = loginPage;
|
|
75
70
|
}
|
|
76
71
|
throw err_1;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"axiosInstance.js","sourceRoot":"","sources":["../../src/axiosInstance.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,
|
|
1
|
+
{"version":3,"file":"axiosInstance.js","sourceRoot":"","sources":["../../src/axiosInstance.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,23 +1,7 @@
|
|
|
1
|
-
import { __assign } from "tslib";
|
|
2
|
-
import { isLoggedCookie } from '../../utils/constants';
|
|
3
|
-
import saveCookiesClient from './saveCookiesClient';
|
|
4
1
|
import PHXFuncGetCookieSession from './getCookieSession';
|
|
5
2
|
export default function PHXFuncGetLoggedInfo() {
|
|
6
3
|
var cookieSession = PHXFuncGetCookieSession();
|
|
7
4
|
var userInfo = cookieSession === null || cookieSession === void 0 ? void 0 : cookieSession.user_info;
|
|
8
|
-
|
|
9
|
-
return userInfo;
|
|
10
|
-
// convert data localStorage to cookie
|
|
11
|
-
if (typeof window !== 'undefined') {
|
|
12
|
-
var loggedInfoString = localStorage.getItem(isLoggedCookie);
|
|
13
|
-
if (loggedInfoString) {
|
|
14
|
-
// convert data to save cookie
|
|
15
|
-
var userInfo_1 = JSON.parse(loggedInfoString);
|
|
16
|
-
saveCookiesClient({ value: __assign(__assign({}, cookieSession), { user_info: userInfo_1 }) });
|
|
17
|
-
localStorage.removeItem(isLoggedCookie);
|
|
18
|
-
return userInfo_1;
|
|
19
|
-
}
|
|
20
|
-
}
|
|
21
|
-
return null;
|
|
5
|
+
return userInfo || null;
|
|
22
6
|
}
|
|
23
7
|
//# sourceMappingURL=getLoginInfo.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getLoginInfo.js","sourceRoot":"","sources":["../../../../src/components/Func/getLoginInfo.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getLoginInfo.js","sourceRoot":"","sources":["../../../../src/components/Func/getLoginInfo.ts"],"names":[],"mappings":"AAAA,OAAO,uBAAqC,MAAM,oBAAoB,CAAA;AAEtE,MAAM,CAAC,OAAO,UAAU,oBAAoB;IAC1C,IAAM,aAAa,GAAG,uBAAuB,EAAE,CAAA;IAC/C,IAAM,QAAQ,GAAG,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,SAAS,CAAA;IACzC,OAAO,QAAQ,IAAI,IAAI,CAAA;AACzB,CAAC"}
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
export declare const isLoggedCookie = "isLoggedIn";
|
|
2
|
-
export declare const AUTH_TOKEN = "authToken";
|
|
3
1
|
export declare const COOKIE_SESSION_SIGN_IN = "phx_session";
|
|
4
2
|
export declare const COOKIE_REFRESH_TOKEN = "refresh_token";
|
|
5
3
|
export declare const loginPage = "/login-sso";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/utils/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,IAAM,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/utils/constants.ts"],"names":[],"mappings":"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"}
|