From cd5eebd08f4bea43afc075b89dca30cff42dbe53 Mon Sep 17 00:00:00 2001 From: ysCha Date: Thu, 2 Apr 2026 14:45:02 +0900 Subject: [PATCH 1/9] =?UTF-8?q?[1840]=EC=83=9D=EC=84=B1=EB=90=98=EC=A7=80?= =?UTF-8?q?=20=EC=95=8A=EC=9D=80=20=ED=8C=94=EC=9E=91=EC=A7=80=EB=B6=95=20?= =?UTF-8?q?=EB=8F=84=EB=A9=B4=20=EC=82=AC=EB=A1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lib/skeletons/SkeletonBuilder.ts | 13 +++++----- src/util/skeleton-utils.js | 37 +++++++++++++++++++++++++++- 2 files changed, 42 insertions(+), 8 deletions(-) diff --git a/src/lib/skeletons/SkeletonBuilder.ts b/src/lib/skeletons/SkeletonBuilder.ts index 01ddb95b..6466782d 100644 --- a/src/lib/skeletons/SkeletonBuilder.ts +++ b/src/lib/skeletons/SkeletonBuilder.ts @@ -253,13 +253,12 @@ export default class SkeletonBuilder { } private static CorrectBisectorDirection(bisector: LineParametric2d, beginNextVertex: Vertex, endPreviousVertex: Vertex, beginEdge: Edge, endEdge: Edge) { - const beginEdge2 = beginNextVertex.PreviousEdge; - const endEdge2 = endPreviousVertex.NextEdge; + // Use the vertex's actual edges — chain edges can become stale + // when previous iterations of MultiSplitEvent modify the LAV + const actualBeginEdge = beginNextVertex.PreviousEdge; + const actualEndEdge = endPreviousVertex.NextEdge; - if (beginEdge !== beginEdge2 || endEdge !== endEdge2) - throw new Error(); - - if (beginEdge.Norm.Dot(endEdge.Norm) < -0.97) { + if (actualBeginEdge.Norm.Dot(actualEndEdge.Norm) < -0.97) { const n1 = PrimitiveUtils.FromTo(endPreviousVertex.Point, bisector.A).Normalized(); const n2 = PrimitiveUtils.FromTo(bisector.A, beginNextVertex.Point).Normalized(); const bisectorPrediction = this.CalcVectorBisector(n1, n2); @@ -887,7 +886,7 @@ export default class SkeletonBuilder { private static GetEdgeInLav(lav: CircularList, oppositeEdge: Edge): Vertex { for (const node of lav.Iterate()) if (oppositeEdge === node.PreviousEdge || - oppositeEdge === node.Previous.Next) + oppositeEdge === (node.Previous as Vertex).NextEdge) return node; return null; diff --git a/src/util/skeleton-utils.js b/src/util/skeleton-utils.js index 17374edd..ae92a224 100644 --- a/src/util/skeleton-utils.js +++ b/src/util/skeleton-utils.js @@ -16,6 +16,39 @@ import wallLine from '@/components/floor-plan/modal/wallLineOffset/type/WallLine */ const EPSILON = 0.1 +/** + * 오목(concave) 폴리곤인지 판별합니다. + * cross product의 부호가 혼재하면 오목 폴리곤입니다. + */ +const isConcavePolygon = (points) => { + if (!points || points.length < 4) return false + let positive = 0, negative = 0 + for (let i = 0; i < points.length; i++) { + const prev = points[(i - 1 + points.length) % points.length] + const curr = points[i] + const next = points[(i + 1) % points.length] + const cross = (curr.x - prev.x) * (next.y - curr.y) - (curr.y - prev.y) * (next.x - curr.x) + if (cross > 0) positive++ + else if (cross < 0) negative++ + } + return positive > 0 && negative > 0 +} + +/** + * 오목 폴리곤에만 미세한 perturbation을 적용하여 동시 이벤트(MultiSplitEvent)를 방지합니다. + * 대칭적 변 길이(예: 45.5, 45.5)가 동일 거리의 이벤트를 만들어 LAV 불일치 오류를 유발하므로 + * 각 꼭짓점에 인덱스 기반 미세 오프셋을 적용하면 이벤트가 개별 SplitEvent로 처리됩니다. + * 볼록 폴리곤은 이 문제가 없으므로 원본을 그대로 반환합니다. + */ +const perturbPolygonPoints = (points, eps = 1e-4) => { + if (!points || points.length < 3) return points + if (!isConcavePolygon(points)) return points + return points.map((p, i) => ({ + x: p.x + (i + 1) * eps, + y: p.y + (i + 1) * eps + })) +} + export const drawSkeletonRidgeRoof = (roofId, canvas, textMode) => { // 2. 스켈레톤 생성 및 그리기 @@ -503,11 +536,13 @@ export const skeletonBuilder = (roofId, canvas, textMode) => { // changRoofLinePoints를 roof.skeletonPoints에 저장 (roof.points 원본은 유지) roof.skeletonPoints = changRoofLinePoints.map(p => ({ x: p.x, y: p.y })) - const geoJSONPolygon = toGeoJSON(changRoofLinePoints) + const perturbedPoints = perturbPolygonPoints(changRoofLinePoints) + const geoJSONPolygon = toGeoJSON(perturbedPoints) try { // SkeletonBuilder는 닫히지 않은 폴리곤을 기대하므로 마지막 점 제거 geoJSONPolygon.pop() + console.log('[SkeletonBuilder] geoJSONPolygon:', JSON.stringify(geoJSONPolygon, null, 2)) const skeleton = SkeletonBuilder.BuildFromGeoJSON([[geoJSONPolygon]]) // 스켈레톤 데이터를 기반으로 내부선 생성 From 90228121991215d5d998e6880bb316cf640c7de9 Mon Sep 17 00:00:00 2001 From: ysCha Date: Thu, 2 Apr 2026 18:27:12 +0900 Subject: [PATCH 2/9] =?UTF-8?q?[1480]=EC=82=AC=EC=9D=98=20=EA=B0=81?= =?UTF-8?q?=EB=8F=84=20=EC=84=A4=EC=A0=95=EC=9D=84=20"=EA=B0=81=EB=8F=84"?= =?UTF-8?q?=EB=A1=9C=20=ED=96=88=EC=9D=84=20=EB=95=8C=20=EB=B0=9C=EC=83=9D?= =?UTF-8?q?=ED=95=98=EB=8A=94=20=EB=AC=B8=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/module/useTrestle.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/hooks/module/useTrestle.js b/src/hooks/module/useTrestle.js index 19da5b4e..fad9a810 100644 --- a/src/hooks/module/useTrestle.js +++ b/src/hooks/module/useTrestle.js @@ -799,6 +799,7 @@ export const useTrestle = () => { const parent = canvas.getObjects().find((obj) => obj.id === surface.parentId) const { directionText, roofMaterial, moduleCompass, surfaceCompass } = parent const slope = Number(roofMaterial.pitch) + const angle = Number(roofMaterial.angle) const roofMaterialIndex = parent.roofMaterial.index const { nameJp: roofMaterialIdMulti } = roofMaterial const moduleSelection = moduleSelectionData?.roofConstructions?.find((construction) => construction.roofIndex === roofMaterialIndex) @@ -836,7 +837,7 @@ export const useTrestle = () => { supportMeaker, slope: +roofSizeSet === 3 ? 0 : slope, classType: currentAngleType === 'slope' ? '0' : '1', - angle: +roofSizeSet === 3 ? 0 : getDegreeByChon(slope), + angle: +roofSizeSet === 3 ? 0 : angle, azimuth: getAzimuth(parent), moduleList, } From 3eaf3f2c174f8b474c1fe38806e6afa39f694735 Mon Sep 17 00:00:00 2001 From: ysCha Date: Fri, 3 Apr 2026 09:12:43 +0900 Subject: [PATCH 3/9] =?UTF-8?q?[1480]=EC=82=AC=EC=9D=98=20=EA=B0=81?= =?UTF-8?q?=EB=8F=84=20=EC=84=A4=EC=A0=95=EC=9D=84=20"=EA=B0=81=EB=8F=84"?= =?UTF-8?q?=EB=A1=9C=20=ED=96=88=EC=9D=84=20=EB=95=8C=20=EB=B0=9C=EC=83=9D?= =?UTF-8?q?=ED=95=98=EB=8A=94=20=EB=AC=B8=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/module/useTrestle.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hooks/module/useTrestle.js b/src/hooks/module/useTrestle.js index fad9a810..411fc118 100644 --- a/src/hooks/module/useTrestle.js +++ b/src/hooks/module/useTrestle.js @@ -799,7 +799,7 @@ export const useTrestle = () => { const parent = canvas.getObjects().find((obj) => obj.id === surface.parentId) const { directionText, roofMaterial, moduleCompass, surfaceCompass } = parent const slope = Number(roofMaterial.pitch) - const angle = Number(roofMaterial.angle) + const angle = Number(roofMaterial.angle) || getDegreeByChon(slope) const roofMaterialIndex = parent.roofMaterial.index const { nameJp: roofMaterialIdMulti } = roofMaterial const moduleSelection = moduleSelectionData?.roofConstructions?.find((construction) => construction.roofIndex === roofMaterialIndex) @@ -1123,7 +1123,7 @@ export const useTrestle = () => { return } const roof = canvas.getObjects().find((obj) => obj.id === surface.parentId) - const degree = getDegreeByChon(roof.roofMaterial.pitch) + const degree = Number(roof.roofMaterial.angle) || getDegreeByChon(roof.roofMaterial.pitch) rackIntvlPct = rackIntvlPct === 0 ? 1 : rackIntvlPct // 0인 경우 1로 변경 rackIntvlPct = 100 / rackIntvlPct // 퍼센트로 변경 const moduleLeft = lastX ?? left From 138bdbdd35a91c536a2c86f75e3cda55be3a3558 Mon Sep 17 00:00:00 2001 From: ysCha Date: Fri, 3 Apr 2026 11:14:47 +0900 Subject: [PATCH 4/9] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8,=20=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=EC=95=84=EC=9B=83=20=EC=B6=94=EC=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/auth/Login.jsx | 1 + src/components/header/Header.jsx | 13 ++++--------- src/components/main/ChangePasswordPop.jsx | 15 ++++++--------- 3 files changed, 11 insertions(+), 18 deletions(-) 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) { From ccf60ee7846a9e3c72091e27b259eb62e164279e Mon Sep 17 00:00:00 2001 From: ysCha Date: Fri, 3 Apr 2026 13:17:58 +0900 Subject: [PATCH 5/9] =?UTF-8?q?=EC=9E=90=EB=8F=99=20=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=EC=9D=B8,=20=EB=A1=9C=EA=B7=B8=EC=95=84=EC=9B=83=20=EC=B6=94?= =?UTF-8?q?=EC=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/auth/AutoLogin.jsx | 2 ++ src/components/auth/Login.jsx | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/auth/AutoLogin.jsx b/src/components/auth/AutoLogin.jsx index b3dcbb6e..c8e42c49 100644 --- a/src/components/auth/AutoLogin.jsx +++ b/src/components/auth/AutoLogin.jsx @@ -3,6 +3,7 @@ import { useState } from 'react' import { useMessage } from '@/hooks/useMessage' import { setSession, login } from '@/lib/authActions' +import Cookies from 'js-cookie' import { sessionStore } from '@/store/commonAtom' import { useRecoilState } from 'recoil' import { useAxios } from '@/hooks/useAxios' @@ -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 7ee11682..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,7 +108,7 @@ export default function Login() { if (res) { setIsLoading(false) if (res.data.result.resultCode === 'S') { - Cookies.set('sessionId', res.data.sessionId) + if (res.data.sessionId) Cookies.set('sessionId', res.data.sessionId) setSession(res.data.data) setSessionState(res.data.data) // ID SAVE 체크되어 있는 경우, 쿠키 저장 From c6da437a8def16bb5b3de56c5cfb5c93bbe94968 Mon Sep 17 00:00:00 2001 From: ysCha Date: Fri, 3 Apr 2026 13:35:23 +0900 Subject: [PATCH 6/9] =?UTF-8?q?=EC=9E=90=EB=8F=99=20=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=EC=9D=B8,=20=EB=A1=9C=EA=B7=B8=EC=95=84=EC=9B=83=20=EC=B6=94?= =?UTF-8?q?=EC=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/useLogout.js | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 src/hooks/useLogout.js diff --git a/src/hooks/useLogout.js b/src/hooks/useLogout.js new file mode 100644 index 00000000..cbaed9db --- /dev/null +++ b/src/hooks/useLogout.js @@ -0,0 +1,38 @@ +import { useRecoilState, useRecoilValue } from 'recoil' +import { sessionStore } from '@/store/commonAtom' +import { globalLocaleStore } from '@/store/localeAtom' +import { stuffSearchState } from '@/store/stuffAtom' +import { useAxios } from '@/hooks/useAxios' +import { logout } from '@/lib/authActions' +import Cookies from 'js-cookie' + +export function useLogout() { + const [sessionState] = useRecoilState(sessionStore) + const [stuffSearch, setStuffSearch] = useRecoilState(stuffSearchState) + const globalLocaleState = useRecoilValue(globalLocaleStore) + const { promisePost } = useAxios(globalLocaleState) + + const logoutProcess = async () => { + const param = { + loginId: sessionState.userId, + requestId: Cookies.get('sessionId'), + } + await promisePost({ url: '/api/login/v1.0/logout', data: param }) + .then(async (res) => { + if (res.data.result.resultCode === 'S') { + setStuffSearch({ + ...stuffSearch, + code: 'DELETE', + }) + Cookies.remove('sessionId') + await logout() + window.location.href = '/login' + } + }) + .catch((error) => { + alert(error.response?.data?.message || 'ログアウトに失敗しました。') + }) + } + + return { logoutProcess } +} From b021b7beeae2006b3d626ca9eb833ed22c6bdf33 Mon Sep 17 00:00:00 2001 From: ysCha Date: Fri, 3 Apr 2026 16:15:13 +0900 Subject: [PATCH 7/9] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=95=84=EC=9B=83=20?= =?UTF-8?q?=EA=B2=B0=EA=B3=BC=EC=97=86=EC=9D=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/auth/AutoLogin.jsx | 2 +- src/components/header/Header.jsx | 2 +- src/components/main/ChangePasswordPop.jsx | 6 ++--- src/hooks/useLogout.js | 29 +++++++++++------------ 4 files changed, 18 insertions(+), 21 deletions(-) diff --git a/src/components/auth/AutoLogin.jsx b/src/components/auth/AutoLogin.jsx index c8e42c49..5de9ea85 100644 --- a/src/components/auth/AutoLogin.jsx +++ b/src/components/auth/AutoLogin.jsx @@ -3,12 +3,12 @@ import { useState } from 'react' import { useMessage } from '@/hooks/useMessage' import { setSession, login } from '@/lib/authActions' -import Cookies from 'js-cookie' import { sessionStore } from '@/store/commonAtom' 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' diff --git a/src/components/header/Header.jsx b/src/components/header/Header.jsx index 9da21fb2..8c2ccbff 100644 --- a/src/components/header/Header.jsx +++ b/src/components/header/Header.jsx @@ -50,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) @@ -78,7 +79,6 @@ export default function Header(props) { const { promiseGet } = useAxios() const { swalFire } = useSwal() - const { logoutProcess } = useLogout() /** * 지붕재 목록 Header에서 조회 diff --git a/src/components/main/ChangePasswordPop.jsx b/src/components/main/ChangePasswordPop.jsx index 064b6680..58c22d69 100644 --- a/src/components/main/ChangePasswordPop.jsx +++ b/src/components/main/ChangePasswordPop.jsx @@ -6,10 +6,9 @@ import { useRecoilState, useRecoilValue } from 'recoil' import { useAxios } from '@/hooks/useAxios' import { globalLocaleStore } from '@/store/localeAtom' 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' +import { useLogout } from '@/hooks/useLogout' export default function ChangePasswordPop(props) { const globalLocaleState = useRecoilValue(globalLocaleStore) @@ -18,10 +17,9 @@ 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() + const { logoutProcess } = useLogout() const formInitValue = { password1: '', password2: '', diff --git a/src/hooks/useLogout.js b/src/hooks/useLogout.js index cbaed9db..9b2d638e 100644 --- a/src/hooks/useLogout.js +++ b/src/hooks/useLogout.js @@ -17,21 +17,20 @@ export function useLogout() { loginId: sessionState.userId, requestId: Cookies.get('sessionId'), } - await promisePost({ url: '/api/login/v1.0/logout', data: param }) - .then(async (res) => { - if (res.data.result.resultCode === 'S') { - setStuffSearch({ - ...stuffSearch, - code: 'DELETE', - }) - Cookies.remove('sessionId') - await logout() - window.location.href = '/login' - } - }) - .catch((error) => { - alert(error.response?.data?.message || 'ログアウトに失敗しました。') - }) + + try { + await promisePost({ url: '/api/login/v1.0/logout', data: param }) + } catch (error) { + console.log('logout api error:', error) + } + + setStuffSearch({ + ...stuffSearch, + code: 'DELETE', + }) + Cookies.remove('sessionId') + await logout() + window.location.href = '/login' } return { logoutProcess } From afe0a377db39cd71e3384adff3e72d7e036b8348 Mon Sep 17 00:00:00 2001 From: ysCha Date: Fri, 3 Apr 2026 16:20:12 +0900 Subject: [PATCH 8/9] =?UTF-8?q?=EC=9E=90=EB=8F=99=20=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=EC=9D=B8,=20=EB=A1=9C=EA=B7=B8=EC=95=84=EC=9B=83=20=EC=B6=94?= =?UTF-8?q?=EC=A0=812?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/useLogout.js | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/hooks/useLogout.js b/src/hooks/useLogout.js index 9b2d638e..08ef1cc3 100644 --- a/src/hooks/useLogout.js +++ b/src/hooks/useLogout.js @@ -6,6 +6,11 @@ import { useAxios } from '@/hooks/useAxios' import { logout } from '@/lib/authActions' import Cookies from 'js-cookie' +/** + * 로그아웃 처리 Hook + * - 로그아웃 API 호출 후 성공/실패 상관없이 로그아웃 처리 + * - Header, ChangePasswordPop 등에서 공통으로 사용 + */ export function useLogout() { const [sessionState] = useRecoilState(sessionStore) const [stuffSearch, setStuffSearch] = useRecoilState(stuffSearchState) @@ -15,22 +20,24 @@ export function useLogout() { const logoutProcess = async () => { const param = { loginId: sessionState.userId, - requestId: Cookies.get('sessionId'), + requestId: Cookies.get('sessionId'), // 로그인 시 저장한 sessionId } + // 로그아웃 API 호출 (실패해도 로그아웃 진행) try { await promisePost({ url: '/api/login/v1.0/logout', data: param }) } catch (error) { console.log('logout api error:', error) } + // 물건검색 상태 초기화 setStuffSearch({ ...stuffSearch, code: 'DELETE', }) - Cookies.remove('sessionId') - await logout() - window.location.href = '/login' + Cookies.remove('sessionId') // sessionId 쿠키 삭제 + await logout() // iron-session 세션 파기 + window.location.href = '/login' // 로그인 페이지로 이동 (full reload) } return { logoutProcess } From 71da4d07feafaff4d90edf732d6a4fdecc2b9989 Mon Sep 17 00:00:00 2001 From: ysCha Date: Wed, 8 Apr 2026 10:08:42 +0900 Subject: [PATCH 9/9] =?UTF-8?q?=EC=9E=84=EC=8B=9C=EC=A0=80=EC=9E=A5=20?= =?UTF-8?q?=EC=83=81=EC=84=B8=20=ED=8F=BC=EC=9D=98=20=EB=AC=BC=EA=B1=B4?= =?UTF-8?q?=EB=AA=85=20=EC=9E=85=EB=A0=A5=2050=EC=9E=90=EC=A0=9C=ED=95=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/management/StuffDetail.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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() { })} {/* 라디오끝 */}
- +
+