diff --git a/src/config/sessionAuth.ts b/src/config/sessionAuth.ts index 6161ba9..adde57a 100644 --- a/src/config/sessionAuth.ts +++ b/src/config/sessionAuth.ts @@ -1,5 +1,6 @@ import { create } from "zustand"; import { getToken, removeRefreshToken, removeToken } from "./func"; +import { useAuthStore } from "@/pages/auth/store/AuthStore"; type SessionAuthStore = { isAuthenticated: boolean; @@ -14,6 +15,7 @@ export const useSessionAuth = create((set) => ({ removeToken(); removeRefreshToken(); window.isRefreshTokenExpired = false; + useAuthStore.getState().reset(); set({ isAuthenticated: false }); }, })); diff --git a/src/pages/auth/store/AuthStore.ts b/src/pages/auth/store/AuthStore.ts index 99d2418..28f9cc0 100644 --- a/src/pages/auth/store/AuthStore.ts +++ b/src/pages/auth/store/AuthStore.ts @@ -1,21 +1,28 @@ import { create } from "zustand"; import { type AuthStoreType } from "../../auth/types/AuthTypes"; -export const useAuthStore = create((set) => ({ +const initialState = { phone: "", + email: "", + stepLogin: 1, + devOtpCode: "", +}; + +export const useAuthStore = create((set) => ({ + ...initialState, setPhone(value) { set({ phone: value }); }, - email: "", setEmail(value) { set({ email: value }); }, - stepLogin: 1, setStepLogin(value) { set({ stepLogin: value }); }, - devOtpCode: "", setDevOtpCode(value) { set({ devOtpCode: value }); }, + reset() { + set({ ...initialState }); + }, })); diff --git a/src/pages/auth/types/AuthTypes.ts b/src/pages/auth/types/AuthTypes.ts index e7ae709..e649750 100644 --- a/src/pages/auth/types/AuthTypes.ts +++ b/src/pages/auth/types/AuthTypes.ts @@ -15,6 +15,7 @@ export type AuthStoreType = { /** TODO: remove before production — dev-only OTP from API response */ devOtpCode: string; setDevOtpCode: (value: string) => void; + reset: () => void; }; export type LoginWithPasswordType = { diff --git a/src/shared/Sidebar.tsx b/src/shared/Sidebar.tsx index ded8dad..642d671 100644 --- a/src/shared/Sidebar.tsx +++ b/src/shared/Sidebar.tsx @@ -66,7 +66,7 @@ const SideBar: FC = () => { title={t('sidebar.mainPage')} isActive={isActive('/home')} link={Paths.home} - activeName='' + activeName='dashboard' />