From c54595c99c2d74ca2b100c8b01c6fe3b53b86aa9 Mon Sep 17 00:00:00 2001 From: eglehelms Date: Mon, 5 Dec 2022 16:47:21 +0100 Subject: [PATCH] fix routing --- src/containers/login/create-password.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/containers/login/create-password.tsx b/src/containers/login/create-password.tsx index de3266d..cfaf277 100644 --- a/src/containers/login/create-password.tsx +++ b/src/containers/login/create-password.tsx @@ -21,11 +21,10 @@ import { } from "src/constants"; import type { IMessage } from "src/store/types"; -import { useSelectState } from "src/store"; import { USER_ACCOUNT } from "src/api/constants"; +import { getToken, parseJwt } from "src/router/auth"; export const CreatePassword = () => { - const user = useSelectState("user"); const [passwdSettings] = useApiData("PasswordSettings"); const [password, setPassword] = useState(""); const [confirmPassword, setConfirmPassword] = useState(""); @@ -57,6 +56,7 @@ export const CreatePassword = () => { const userSid = sessionStorage.getItem(SESS_USER_SID); const oldPassword = sessionStorage.getItem(SESS_OLD_PASSWORD); + const token = getToken(); if (!oldPassword) { navigate(ROUTE_LOGIN); @@ -73,7 +73,7 @@ export const CreatePassword = () => { sessionStorage.clear(); navigate( - user?.scope !== USER_ACCOUNT + parseJwt(token).scope !== USER_ACCOUNT ? ROUTE_INTERNAL_ACCOUNTS : ROUTE_INTERNAL_APPLICATIONS );