From 12895a7526f491c08c6c77e2f43993281ce79f94 Mon Sep 17 00:00:00 2001
From: dain <dainbabo@naver.com>
Date: Mon, 4 Aug 2025 16:33:43 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=90=9B=20fix:=20=EC=98=A4=EB=A5=98=20?=
 =?UTF-8?q?=EB=AA=A8=EB=8B=AC+=EC=9D=B4=EB=8F=99=20=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/login/callback/kakaocallback.tsx | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/app/login/callback/kakaocallback.tsx b/src/app/login/callback/kakaocallback.tsx
index c8b21346..a74f2209 100644
--- a/src/app/login/callback/kakaocallback.tsx
+++ b/src/app/login/callback/kakaocallback.tsx
@@ -24,6 +24,7 @@ export default function KakaoCallbackPage() {
   const APP_URL = process.env.NEXT_PUBLIC_APP_URL;
   const VERCEL_HOST = process.env.NEXT_PUBLIC_VERCEL_URL;
   const [isModalOpen, setIsModalOpen] = useState(false);
+  const [msg, setMsg] = useState('');
   const baseUrl =
     isProduction && VERCEL_HOST
       ? VERCEL_HOST.replace(/\/$/, '')
@@ -56,6 +57,8 @@ export default function KakaoCallbackPage() {
     } catch (err) {
       const apiErr = err as ApiError;
       if (apiErr.response?.status === 404) {
+        setIsModalOpen(true);
+        setMsg('먼저 회원가입을 해주세요.');
         return router.replace('/signUp');
       }
     }
@@ -82,6 +85,7 @@ export default function KakaoCallbackPage() {
           apiErr.response?.data?.message === '이미 등록된 사용자입니다.'
         ) {
           setIsModalOpen(true);
+          setMsg('이미 등록된 아이디 입니다.');
           return;
         }
       }
@@ -99,11 +103,15 @@ export default function KakaoCallbackPage() {
     <>
       {isModalOpen && (
         <Modal
-          message='이미 등록된 아이디 입니다.'
+          message={msg}
           variant='onlyText'
           onClose={() => {
             setIsModalOpen(false);
-            router.replace('/login');
+            if (flow === 'login') {
+              router.replace('/signUp');
+            } else {
+              router.replace('/login');
+            }
           }}
         />
       )}

From 9367667c3d3df54e0a15b68e7e600c9b0cc335f5 Mon Sep 17 00:00:00 2001
From: dain <dainbabo@naver.com>
Date: Mon, 4 Aug 2025 17:18:23 +0900
Subject: [PATCH 2/2] =?UTF-8?q?fix:=ED=95=84=EC=9A=94=EC=97=86=EB=8A=94=20?=
 =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/login/callback/kakaocallback.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/login/callback/kakaocallback.tsx b/src/app/login/callback/kakaocallback.tsx
index a74f2209..5aadb289 100644
--- a/src/app/login/callback/kakaocallback.tsx
+++ b/src/app/login/callback/kakaocallback.tsx
@@ -59,7 +59,6 @@ export default function KakaoCallbackPage() {
       if (apiErr.response?.status === 404) {
         setIsModalOpen(true);
         setMsg('먼저 회원가입을 해주세요.');
-        return router.replace('/signUp');
       }
     }