diff --git a/src/components/auth/Login.jsx b/src/components/auth/Login.jsx index 7a6ba957..7ee11682 100644 --- a/src/components/auth/Login.jsx +++ b/src/components/auth/Login.jsx @@ -107,6 +107,7 @@ export default function Login() { if (res) { setIsLoading(false) if (res.data.result.resultCode === 'S') { + Cookies.set('sessionId', res.data.sessionId) setSession(res.data.data) setSessionState(res.data.data) // ID SAVE 체크되어 있는 경우, 쿠키 저장 diff --git a/src/components/header/Header.jsx b/src/components/header/Header.jsx index 561b8e47..9da21fb2 100644 --- a/src/components/header/Header.jsx +++ b/src/components/header/Header.jsx @@ -8,7 +8,8 @@ import { useRecoilState, useRecoilValue, useResetRecoilState } from 'recoil' import { dimmedStore, sessionStore } from '@/store/commonAtom' import { useMessage } from '@/hooks/useMessage' -import { checkSession, logout } from '@/lib/authActions' +import { checkSession } from '@/lib/authActions' +import { useLogout } from '@/hooks/useLogout' import QSelectBox from '@/components/common/select/QSelectBox' @@ -77,6 +78,7 @@ export default function Header(props) { const { promiseGet } = useAxios() const { swalFire } = useSwal() + const { logoutProcess } = useLogout() /** * 지붕재 목록 Header에서 조회 @@ -372,14 +374,7 @@ export default function Header(props) {
diff --git a/src/components/main/ChangePasswordPop.jsx b/src/components/main/ChangePasswordPop.jsx index 28dc537c..064b6680 100644 --- a/src/components/main/ChangePasswordPop.jsx +++ b/src/components/main/ChangePasswordPop.jsx @@ -5,7 +5,8 @@ import { sessionStore } from '@/store/commonAtom' import { useRecoilState, useRecoilValue } from 'recoil' import { useAxios } from '@/hooks/useAxios' import { globalLocaleStore } from '@/store/localeAtom' -import { login, logout, setSession } from '@/lib/authActions' +import { login, setSession } from '@/lib/authActions' +import { useLogout } from '@/hooks/useLogout' import { useSwal } from '@/hooks/useSwal' import { QcastContext } from '@/app/QcastProvider' import { useRouter } from 'next/navigation' @@ -17,6 +18,7 @@ export default function ChangePasswordPop(props) { const { swalFire } = useSwal() const { patch } = useAxios(globalLocaleState) + const { logoutProcess } = useLogout() const { getMessage } = useMessage() const [sessionState, setSessionState] = useRecoilState(sessionStore) const router = useRouter() @@ -129,15 +131,13 @@ export default function ChangePasswordPop(props) { } } else { setIsGlobalLoading(false) - logout() - router.replace('/login', undefined, { shallow: true }) + logoutProcess() console.log('code not 200 error') } }) .catch((error) => { setIsGlobalLoading(false) - logout() - router.replace('/login', undefined, { shallow: true }) + logoutProcess() console.log('catch::::::::', error) }) } @@ -209,10 +209,7 @@ export default function ChangePasswordPop(props) {