From 8f0e6eba02b004a6ee15de29c981dd2026e5cb5c Mon Sep 17 00:00:00 2001
From: iubns <iubns@naver.com>
Date: Sun, 26 Jul 2026 12:37:33 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=EC=9E=98=EB=AA=BB=EB=90=9C=20=EB=A1=9C?=
 =?UTF-8?q?=EA=B7=B8=EC=9D=B8=20=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/app/common/login/page.tsx | 45 ++++++++++++++++------------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/client/src/app/common/login/page.tsx b/client/src/app/common/login/page.tsx
index 0a5c324..5235db6 100644
--- a/client/src/app/common/login/page.tsx
+++ b/client/src/app/common/login/page.tsx
@@ -26,26 +26,33 @@ function Login() {
 
   useEffect(() => {
     const code = searchParams.get("code")
-    console.log("code", code)
-    console.log("isLogin", isLogin)
-    if (code) {
-      //카카오에서 리다이렉트된 경우
-      getKakaoTokenFromAuthCode(code).then((kakaoToken) => {
-        login(kakaoToken)
-          .then(() => {
-            const returnUrl = searchParams.get("state")
-            push(returnUrl || "/")
-          })
-          .catch((e) => {
-            const returnUrl = searchParams.get("state")
-            if (returnUrl === "/retreat/register") {
-              push(`/retreat/search`)
-            }
-          })
-      })
-    } else if (isLogin) {
-      const returnUrl = searchParams.get("returnUrl")
+    if (isLogin) {
+      const returnUrl =
+        searchParams.get("returnUrl") || searchParams.get("state")
       push(returnUrl || "/")
+    } else if (code) {
+      //카카오에서 리다이렉트된 경우
+      getKakaoTokenFromAuthCode(code)
+        .then((kakaoToken) => {
+          console.log("kakaoToken", kakaoToken)
+          login(kakaoToken)
+            .then(() => {
+              const returnUrl = searchParams.get("state")
+              push(returnUrl || "/")
+            })
+            .catch((e) => {
+              const returnUrl = searchParams.get("state")
+              if (returnUrl === "/retreat/register") {
+                push(`/retreat/search`)
+              }
+            })
+        })
+        .catch((e) => {
+          const returnUrl = searchParams.get("state")
+          if (returnUrl === "/retreat/register") {
+            push(`/retreat/search`)
+          }
+        })
     }
   }, [searchParams.get("code"), isLogin])