diff options
| author | Rafi Zadanly <zadanlyr@gmail.com> | 2023-10-16 11:22:54 +0700 |
|---|---|---|
| committer | Rafi Zadanly <zadanlyr@gmail.com> | 2023-10-16 11:22:54 +0700 |
| commit | 8eef74c25930b532d55229f130befdad6eb0ea56 (patch) | |
| tree | c129db6a73b6db840c2b821d3846d96bf9ef4ec5 /src/lib/auth | |
| parent | d9526998613669289c5b37912e15d8e93edcb4e3 (diff) | |
| parent | 6aa5fa70cf5ccd2825e5657ec1a90e370dea3bcf (diff) | |
Merge branch 'CR/UI' into development
Diffstat (limited to 'src/lib/auth')
| -rw-r--r-- | src/lib/auth/components/IsAuth.jsx | 2 | ||||
| -rw-r--r-- | src/lib/auth/hooks/useLogin.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/auth/components/IsAuth.jsx b/src/lib/auth/components/IsAuth.jsx index a32e648c..1948ae0c 100644 --- a/src/lib/auth/components/IsAuth.jsx +++ b/src/lib/auth/components/IsAuth.jsx @@ -8,7 +8,7 @@ const IsAuth = ({ children }) => { useEffect(() => { if (!getAuth() && router.pathname != '/login') { - router.replace(`/login?next=${router.asPath}`) + router.replace(`/login?next=${encodeURIComponent(router.asPath)}`) } else { setResponse(children) } diff --git a/src/lib/auth/hooks/useLogin.js b/src/lib/auth/hooks/useLogin.js index 34605614..17731a86 100644 --- a/src/lib/auth/hooks/useLogin.js +++ b/src/lib/auth/hooks/useLogin.js @@ -71,7 +71,7 @@ const useLogin = () => { if (data.isAuth) { session.odooUser = data.user setCookie('auth', JSON.stringify(session?.odooUser)) - router.push(router?.query?.next ?? '/') + router.push(decodeURIComponent(router?.query?.next) ?? '/') return } } |