diff --git a/src/components/auth/AutoLogin.jsx b/src/components/auth/AutoLogin.jsx
index b3dcbb6e..5de9ea85 100644
--- a/src/components/auth/AutoLogin.jsx
+++ b/src/components/auth/AutoLogin.jsx
@@ -8,6 +8,7 @@ import { useRecoilState } from 'recoil'
import { useAxios } from '@/hooks/useAxios'
import { globalLocaleStore } from '@/store/localeAtom'
import { useRouter } from 'next/navigation'
+import Cookies from 'js-cookie'
import GlobalSpinner from '@/components/common/spinner/GlobalSpinner'
@@ -31,6 +32,7 @@ export default function AutoLoginPage({ autoLoginParam }) {
setIsLoading(false)
if (response.data) {
const res = response.data
+ if (res.sessionId) Cookies.set('sessionId', res.sessionId)
const result = { ...res, storeLvl: res.groupId === '60000' ? '1' : '2', pwdInitYn: 'Y' }
setSession(result)
setSessionState(result)
diff --git a/src/components/auth/Login.jsx b/src/components/auth/Login.jsx
index 7a6ba957..d20f5320 100644
--- a/src/components/auth/Login.jsx
+++ b/src/components/auth/Login.jsx
@@ -48,6 +48,7 @@ export default function Login() {
post({ url: '/api/login/v1.0/user', data: { loginId: res.data } }).then((response) => {
setIsLoading(false)
if (response) {
+ if (response.sessionId) Cookies.set('sessionId', response.sessionId)
const result = { ...response, storeLvl: response.groupId === '60000' ? '1' : '2', pwdInitYn: 'Y' }
setSession(result)
setSessionState(result)
@@ -107,6 +108,7 @@ export default function Login() {
if (res) {
setIsLoading(false)
if (res.data.result.resultCode === 'S') {
+ if (res.data.sessionId) 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..8c2ccbff 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'
@@ -49,6 +50,7 @@ export default function Header(props) {
const [stuffSearch, setStuffSearch] = useRecoilState(stuffSearchState)
const { closeAll } = usePopup()
+ const { logoutProcess } = useLogout()
const { userSession } = props
const [sessionState, setSessionState] = useRecoilState(sessionStore)
@@ -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..58c22d69 100644
--- a/src/components/main/ChangePasswordPop.jsx
+++ b/src/components/main/ChangePasswordPop.jsx
@@ -5,10 +5,10 @@ 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 { useSwal } from '@/hooks/useSwal'
import { QcastContext } from '@/app/QcastProvider'
-import { useRouter } from 'next/navigation'
+import { useLogout } from '@/hooks/useLogout'
export default function ChangePasswordPop(props) {
const globalLocaleState = useRecoilValue(globalLocaleStore)
@@ -19,7 +19,7 @@ export default function ChangePasswordPop(props) {
const { patch } = useAxios(globalLocaleState)
const { getMessage } = useMessage()
const [sessionState, setSessionState] = useRecoilState(sessionStore)
- const router = useRouter()
+ const { logoutProcess } = useLogout()
const formInitValue = {
password1: '',
password2: '',
@@ -129,15 +129,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 +207,7 @@ export default function ChangePasswordPop(props) {
diff --git a/src/components/management/StuffDetail.jsx b/src/components/management/StuffDetail.jsx
index 12eef9ff..341e537d 100644
--- a/src/components/management/StuffDetail.jsx
+++ b/src/components/management/StuffDetail.jsx
@@ -1868,7 +1868,7 @@ export default function StuffDetail() {
})}
{/* 라디오끝 */}
-
+