phx-react 1.3.1596 → 1.3.1598
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 +4 -0
- package/dist/cjs/axiosInstance.js.map +1 -1
- package/dist/cjs/hooks/use-router-back.js +6 -1
- package/dist/cjs/hooks/use-router-back.js.map +1 -1
- package/dist/esm/axiosInstance.js +4 -0
- package/dist/esm/axiosInstance.js.map +1 -1
- package/dist/esm/hooks/use-router-back.js +7 -2
- package/dist/esm/hooks/use-router-back.js.map +1 -1
- package/package.json +1 -1
|
@@ -10,6 +10,7 @@ const saveCookiesClient_1 = tslib_1.__importDefault(require("./components/Func/s
|
|
|
10
10
|
const getCookieSession_1 = tslib_1.__importDefault(require("./components/Func/getCookieSession"));
|
|
11
11
|
const sessionStore_1 = require("./components/Func/sessionStore");
|
|
12
12
|
const js_cookie_1 = tslib_1.__importDefault(require("js-cookie"));
|
|
13
|
+
const save_local_storage_1 = require("./components/Func/save-local-storage");
|
|
13
14
|
const lock = new async_lock_1.default();
|
|
14
15
|
const isServer = typeof window === 'undefined';
|
|
15
16
|
const publicUrl = (0, read_env_config_1.getEnv)('NEXT_PUBLIC_API_GATEWAY', process.env.NEXT_PUBLIC_API_GATEWAY);
|
|
@@ -32,6 +33,8 @@ const refreshAccessToken = async () => {
|
|
|
32
33
|
const currentSession = (0, getCookieSession_1.default)();
|
|
33
34
|
// Lưu lại vào cookie phía client
|
|
34
35
|
currentSession === null || currentSession === void 0 ? true : delete currentSession.access_token;
|
|
36
|
+
// vì chuyển đổi sang lưu vào local storage nên phải xóa cookie
|
|
37
|
+
js_cookie_1.default.remove(constants_1.COOKIE_SESSION_SIGN_IN);
|
|
35
38
|
(0, saveCookiesClient_1.default)({ value: { ...currentSession, access_token: newToken } });
|
|
36
39
|
// Cập nhật cache
|
|
37
40
|
accessTokenCache = newToken;
|
|
@@ -40,6 +43,7 @@ const refreshAccessToken = async () => {
|
|
|
40
43
|
catch (err) {
|
|
41
44
|
(0, sessionStore_1.clearSession)();
|
|
42
45
|
js_cookie_1.default.remove(constants_1.COOKIE_SESSION_SIGN_IN);
|
|
46
|
+
(0, save_local_storage_1.deleteLocalStorage)(constants_1.COOKIE_SESSION_SIGN_IN);
|
|
43
47
|
if (!isServer) {
|
|
44
48
|
window.location.href = constants_1.loginPage;
|
|
45
49
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"axiosInstance.js","sourceRoot":"","sources":["../../src/axiosInstance.ts"],"names":[],"mappings":";;;;AAAA,0DAAyB;AACzB,oEAAkC;AAClC,uDAA0C;AAC1C,iDAA2F;AAC3F,oGAAmE;AACnE,kGAAwE;AAExE,iEAA6D;AAC7D,kEAA+B;
|
|
1
|
+
{"version":3,"file":"axiosInstance.js","sourceRoot":"","sources":["../../src/axiosInstance.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,10 +6,15 @@ const navigation_1 = require("next/navigation");
|
|
|
6
6
|
const page_tracker_store_1 = require("../stores/page-tracker/page-tracker-store");
|
|
7
7
|
const PHXUseRouterBack = () => {
|
|
8
8
|
const router = (0, navigation_1.useRouter)();
|
|
9
|
+
const searchParams = (0, navigation_1.useSearchParams)();
|
|
9
10
|
const referrer = (0, page_tracker_store_1.usePageTrackerStore)((state) => state.referrer);
|
|
10
11
|
const isFirstPage = (0, page_tracker_store_1.usePageTrackerStore)((state) => state.isFirstPage);
|
|
11
12
|
const routerBack = (backLink) => {
|
|
12
|
-
|
|
13
|
+
const isFromNotification = (searchParams === null || searchParams === void 0 ? void 0 : searchParams.get('ref')) === 'notification';
|
|
14
|
+
if (isFromNotification) {
|
|
15
|
+
router.push(backLink);
|
|
16
|
+
}
|
|
17
|
+
else if (isFirstPage && referrer) {
|
|
13
18
|
router.push(referrer);
|
|
14
19
|
}
|
|
15
20
|
else if (isFirstPage) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-router-back.js","sourceRoot":"","sources":["../../../src/hooks/use-router-back.ts"],"names":[],"mappings":";AAAA,YAAY,CAAA;;;AAEZ,
|
|
1
|
+
{"version":3,"file":"use-router-back.js","sourceRoot":"","sources":["../../../src/hooks/use-router-back.ts"],"names":[],"mappings":";AAAA,YAAY,CAAA;;;AAEZ,gDAA4D;AAC5D,kFAA+E;AAExE,MAAM,gBAAgB,GAAG,GAAG,EAAE;IACnC,MAAM,MAAM,GAAG,IAAA,sBAAS,GAAE,CAAA;IAC1B,MAAM,YAAY,GAAG,IAAA,4BAAe,GAAE,CAAA;IACtC,MAAM,QAAQ,GAAG,IAAA,wCAAmB,EAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;IAC/D,MAAM,WAAW,GAAG,IAAA,wCAAmB,EAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;IAErE,MAAM,UAAU,GAAG,CAAC,QAAgB,EAAE,EAAE;QACtC,MAAM,kBAAkB,GAAG,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,GAAG,CAAC,KAAK,CAAC,MAAK,cAAc,CAAA;QAEtE,IAAI,kBAAkB,EAAE,CAAC;YACvB,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QACvB,CAAC;aAAM,IAAI,WAAW,IAAI,QAAQ,EAAE,CAAC;YACnC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QACvB,CAAC;aAAM,IAAI,WAAW,EAAE,CAAC;YACvB,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QACvB,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,IAAI,EAAE,CAAA;QACf,CAAC;IACH,CAAC,CAAA;IAED,OAAO,UAAU,CAAA;AACnB,CAAC,CAAA;AArBY,QAAA,gBAAgB,oBAqB5B"}
|
|
@@ -6,6 +6,7 @@ import saveCookiesClient from './components/Func/saveCookiesClient';
|
|
|
6
6
|
import PHXFuncGetCookieSession from './components/Func/getCookieSession';
|
|
7
7
|
import { clearSession } from './components/Func/sessionStore';
|
|
8
8
|
import Cookies from 'js-cookie';
|
|
9
|
+
import { deleteLocalStorage } from './components/Func/save-local-storage';
|
|
9
10
|
const lock = new AsyncLock();
|
|
10
11
|
const isServer = typeof window === 'undefined';
|
|
11
12
|
const publicUrl = getEnv('NEXT_PUBLIC_API_GATEWAY', process.env.NEXT_PUBLIC_API_GATEWAY);
|
|
@@ -27,6 +28,8 @@ const refreshAccessToken = async () => {
|
|
|
27
28
|
const currentSession = PHXFuncGetCookieSession();
|
|
28
29
|
// Lưu lại vào cookie phía client
|
|
29
30
|
currentSession === null || currentSession === void 0 ? true : delete currentSession.access_token;
|
|
31
|
+
// vì chuyển đổi sang lưu vào local storage nên phải xóa cookie
|
|
32
|
+
Cookies.remove(COOKIE_SESSION_SIGN_IN);
|
|
30
33
|
saveCookiesClient({ value: { ...currentSession, access_token: newToken } });
|
|
31
34
|
// Cập nhật cache
|
|
32
35
|
accessTokenCache = newToken;
|
|
@@ -35,6 +38,7 @@ const refreshAccessToken = async () => {
|
|
|
35
38
|
catch (err) {
|
|
36
39
|
clearSession();
|
|
37
40
|
Cookies.remove(COOKIE_SESSION_SIGN_IN);
|
|
41
|
+
deleteLocalStorage(COOKIE_SESSION_SIGN_IN);
|
|
38
42
|
if (!isServer) {
|
|
39
43
|
window.location.href = loginPage;
|
|
40
44
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"axiosInstance.js","sourceRoot":"","sources":["../../src/axiosInstance.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,SAAS,MAAM,YAAY,CAAA;AAClC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,oBAAoB,EAAE,sBAAsB,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAC3F,OAAO,iBAAiB,MAAM,qCAAqC,CAAA;AACnE,OAAO,uBAAuB,MAAM,oCAAoC,CAAA;AAExE,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAA;AAC7D,OAAO,OAAO,MAAM,WAAW,CAAA;
|
|
1
|
+
{"version":3,"file":"axiosInstance.js","sourceRoot":"","sources":["../../src/axiosInstance.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,17 @@
|
|
|
1
1
|
'use client';
|
|
2
|
-
import { useRouter } from 'next/navigation';
|
|
2
|
+
import { useRouter, useSearchParams } from 'next/navigation';
|
|
3
3
|
import { usePageTrackerStore } from '../stores/page-tracker/page-tracker-store';
|
|
4
4
|
export const PHXUseRouterBack = () => {
|
|
5
5
|
const router = useRouter();
|
|
6
|
+
const searchParams = useSearchParams();
|
|
6
7
|
const referrer = usePageTrackerStore((state) => state.referrer);
|
|
7
8
|
const isFirstPage = usePageTrackerStore((state) => state.isFirstPage);
|
|
8
9
|
const routerBack = (backLink) => {
|
|
9
|
-
|
|
10
|
+
const isFromNotification = (searchParams === null || searchParams === void 0 ? void 0 : searchParams.get('ref')) === 'notification';
|
|
11
|
+
if (isFromNotification) {
|
|
12
|
+
router.push(backLink);
|
|
13
|
+
}
|
|
14
|
+
else if (isFirstPage && referrer) {
|
|
10
15
|
router.push(referrer);
|
|
11
16
|
}
|
|
12
17
|
else if (isFirstPage) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-router-back.js","sourceRoot":"","sources":["../../../src/hooks/use-router-back.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAEZ,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"use-router-back.js","sourceRoot":"","sources":["../../../src/hooks/use-router-back.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAEZ,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAA;AAE/E,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAG,EAAE;IACnC,MAAM,MAAM,GAAG,SAAS,EAAE,CAAA;IAC1B,MAAM,YAAY,GAAG,eAAe,EAAE,CAAA;IACtC,MAAM,QAAQ,GAAG,mBAAmB,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;IAC/D,MAAM,WAAW,GAAG,mBAAmB,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;IAErE,MAAM,UAAU,GAAG,CAAC,QAAgB,EAAE,EAAE;QACtC,MAAM,kBAAkB,GAAG,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,GAAG,CAAC,KAAK,CAAC,MAAK,cAAc,CAAA;QAEtE,IAAI,kBAAkB,EAAE,CAAC;YACvB,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QACvB,CAAC;aAAM,IAAI,WAAW,IAAI,QAAQ,EAAE,CAAC;YACnC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QACvB,CAAC;aAAM,IAAI,WAAW,EAAE,CAAC;YACvB,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QACvB,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,IAAI,EAAE,CAAA;QACf,CAAC;IACH,CAAC,CAAA;IAED,OAAO,UAAU,CAAA;AACnB,CAAC,CAAA"}
|