From 256194d0ebcbc45be458fe5b298f928ee9b6f4ed Mon Sep 17 00:00:00 2001
From: Haesol Lee <haesol2022@naver.com>
Date: Thu, 16 Apr 2026 22:05:14 +0900
Subject: [PATCH 01/15] =?UTF-8?q?feat(web):=20=EC=86=8C=EC=85=9C=20?=
 =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=ED=95=A8=EC=88=98=EB=A5=BC=20?=
 =?UTF-8?q?=EB=A6=AC=EB=8B=A4=EC=9D=B4=EB=A0=89=ED=8A=B8=20url=20=20?=
 =?UTF-8?q?=EB=B0=98=ED=99=98=EC=97=90=EC=84=9C=20=ED=86=A0=ED=81=B0=20?=
 =?UTF-8?q?=EC=A0=84=EB=8B=AC=20=EB=B0=A9=EC=8B=9D=EC=9C=BC=EB=A1=9C=20?=
 =?UTF-8?q?=EA=B5=90=EC=B2=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_pages/auth/use-cases/social-login-url.ts | 19 -----------
 .../src/_pages/auth/use-cases/social-login.ts | 33 +++++++++++++++++++
 apps/web/src/features/auth/ui/login-form.tsx  |  2 +-
 apps/web/src/features/auth/ui/signup-form.tsx |  2 +-
 4 files changed, 35 insertions(+), 21 deletions(-)
 delete mode 100644 apps/web/src/_pages/auth/use-cases/social-login-url.ts
 create mode 100644 apps/web/src/_pages/auth/use-cases/social-login.ts

diff --git a/apps/web/src/_pages/auth/use-cases/social-login-url.ts b/apps/web/src/_pages/auth/use-cases/social-login-url.ts
deleted file mode 100644
index 5f36b714..00000000
--- a/apps/web/src/_pages/auth/use-cases/social-login-url.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { API_BASE_URL, TEAM_ID } from "@/shared/config/env";
-
-/**
- * 구글 소셜 로그인 시작 URL 반환
- * 브라우저가 이 URL로 이동하면 백엔드가 구글 로그인 페이지로 302 리다이렉트
- * 구글 인증 완료 후 /oauth/callback?accessToken=...&refreshToken=... 으로 복귀
- */
-export function getGoogleLoginUrl(): string {
-  return `${API_BASE_URL}/${TEAM_ID}/auth/google`;
-}
-
-/**
- * 카카오 소셜 로그인 시작 URL 반환
- * 브라우저가 이 URL로 이동하면 백엔드가 카카오 로그인 페이지로 302 리다이렉트
- * 카카오 인증 완료 후 /oauth/callback?accessToken=...&refreshToken=... 으로 복귀
- */
-export function getKakaoLoginUrl(): string {
-  return `${API_BASE_URL}/${TEAM_ID}/auth/kakao`;
-}
diff --git a/apps/web/src/_pages/auth/use-cases/social-login.ts b/apps/web/src/_pages/auth/use-cases/social-login.ts
new file mode 100644
index 00000000..8135a873
--- /dev/null
+++ b/apps/web/src/_pages/auth/use-cases/social-login.ts
@@ -0,0 +1,33 @@
+import { API_BASE_URL, TEAM_ID } from "@/shared/config/env";
+
+/**
+ * 구글 소셜 로그인
+ * Google Identity Services SDK로 받은 access_token을 백엔드로 전달
+ * 백엔드가 토큰 검증 후 자체 JWT(accessToken, refreshToken) 발급
+ */
+export async function loginWithGoogle(accessToken: string) {
+  const res = await fetch(`${API_BASE_URL}/${TEAM_ID}/oauth/google`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ token: accessToken }),
+  });
+
+  if (!res.ok) throw new Error("구글 로그인 실패");
+  return res.json() as Promise<{ accessToken: string; refreshToken: string }>;
+}
+
+/**
+ * 카카오 소셜 로그인
+ * Next.js Route Handler에서 카카오 access_token으로 교환 후 백엔드로 전달
+ * 백엔드가 토큰 검증 후 자체 JWT(accessToken, refreshToken) 발급
+ */
+export async function loginWithKakao(accessToken: string) {
+  const res = await fetch(`${API_BASE_URL}/${TEAM_ID}/oauth/kakao`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ token: accessToken }),
+  });
+
+  if (!res.ok) throw new Error("카카오 로그인 실패");
+  return res.json() as Promise<{ accessToken: string; refreshToken: string }>;
+}
diff --git a/apps/web/src/features/auth/ui/login-form.tsx b/apps/web/src/features/auth/ui/login-form.tsx
index 6155edad..b2ae8632 100644
--- a/apps/web/src/features/auth/ui/login-form.tsx
+++ b/apps/web/src/features/auth/ui/login-form.tsx
@@ -5,7 +5,7 @@ import Link from "next/link";
 import { startTransition, useActionState } from "react";
 import { useForm } from "react-hook-form";
 import { loginAction } from "@/_pages/auth/actions";
-import { getGoogleLoginUrl, getKakaoLoginUrl } from "@/_pages/auth/use-cases/social-login-url";
+import { getGoogleLoginUrl, getKakaoLoginUrl } from "@/_pages/auth/use-cases/social-login";
 import { ROUTES } from "@/shared/config/routes";
 import { PasswordInput } from "./password-input";
 
diff --git a/apps/web/src/features/auth/ui/signup-form.tsx b/apps/web/src/features/auth/ui/signup-form.tsx
index b9e778ac..45a60595 100644
--- a/apps/web/src/features/auth/ui/signup-form.tsx
+++ b/apps/web/src/features/auth/ui/signup-form.tsx
@@ -4,7 +4,7 @@ import Link from "next/link";
 import { startTransition, useActionState } from "react";
 import { useForm } from "react-hook-form";
 import { signupAction } from "@/_pages/auth/actions";
-import { getGoogleLoginUrl, getKakaoLoginUrl } from "@/_pages/auth/use-cases/social-login-url";
+import { getGoogleLoginUrl, getKakaoLoginUrl } from "@/_pages/auth/use-cases/social-login";
 import { ROUTES } from "@/shared/config/routes";
 import { PasswordInput } from "./password-input";
 

From 5531d9877c2a6fa33e2a9e86455ca8af3bdab7a1 Mon Sep 17 00:00:00 2001
From: Haesol Lee <haesol2022@naver.com>
Date: Thu, 16 Apr 2026 22:41:36 +0900
Subject: [PATCH 02/15] =?UTF-8?q?feat(web):=20=EC=B9=B4=EC=B9=B4=EC=98=A4?=
 =?UTF-8?q?=20=EC=BD=9C=EB=B0=B1=EC=9D=84=20=EC=9D=B8=EA=B0=80=20=EC=BD=94?=
 =?UTF-8?q?=EB=93=9C=20=EB=B0=A9=EC=8B=9D=EC=9C=BC=EB=A1=9C=20=EC=A0=84?=
 =?UTF-8?q?=ED=99=98=20=EB=B0=8F=20route=20handler=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web/src/app/api/oauth/kakao/route.ts     | 32 +++++++++++++++++
 .../app/oauth/callback/{ => kakao}/page.tsx   | 34 +++++++++++--------
 2 files changed, 52 insertions(+), 14 deletions(-)
 create mode 100644 apps/web/src/app/api/oauth/kakao/route.ts
 rename apps/web/src/app/oauth/callback/{ => kakao}/page.tsx (58%)

diff --git a/apps/web/src/app/api/oauth/kakao/route.ts b/apps/web/src/app/api/oauth/kakao/route.ts
new file mode 100644
index 00000000..c0d79d1a
--- /dev/null
+++ b/apps/web/src/app/api/oauth/kakao/route.ts
@@ -0,0 +1,32 @@
+import { type NextRequest, NextResponse } from "next/server";
+
+// 카카오 인가 코드 -> access_token 교환
+// client_secret이 필요하기 때문에 브라우저가 아닌 서버(Route Handler)에서 처리
+export async function GET(request: NextRequest) {
+  const { searchParams } = new URL(request.url);
+  const code = searchParams.get("code");
+
+  if (!code) {
+    return NextResponse.json({ message: "인가 코드가 없습니다." }, { status: 400 });
+  }
+
+  const tokenRes = await fetch("https://kauth.kakao.com/oauth/token", {
+    method: "POST",
+    headers: { "Content-Type": "application/x-www-form-urlencoded" },
+    body: new URLSearchParams({
+      grant_type: "authorization_code",
+      client_id: process.env.NEXT_PUBLIC_KAKAO_CLIENT_ID!,
+      client_secret: process.env.KAKAO_CLIENT_SECRET!,
+      code,
+      redirect_uri: process.env.NEXT_PUBLIC_KAKAO_REDIRECT_URI!,
+    }),
+  });
+
+  if (!tokenRes.ok) {
+    return NextResponse.json({ message: "카카오 토큰 교환 실패" }, { status: 400 });
+  }
+
+  const { access_token } = await tokenRes.json();
+
+  return NextResponse.json({ accessToken: access_token });
+}
diff --git a/apps/web/src/app/oauth/callback/page.tsx b/apps/web/src/app/oauth/callback/kakao/page.tsx
similarity index 58%
rename from apps/web/src/app/oauth/callback/page.tsx
rename to apps/web/src/app/oauth/callback/kakao/page.tsx
index ed79b226..31c0d374 100644
--- a/apps/web/src/app/oauth/callback/page.tsx
+++ b/apps/web/src/app/oauth/callback/kakao/page.tsx
@@ -3,45 +3,51 @@
 import { LoadingIndicator } from "@moum-zip/ui/components";
 import { useRouter, useSearchParams } from "next/navigation";
 import { Suspense, useEffect, useRef } from "react";
+import { loginWithKakao } from "@/_pages/auth/use-cases/social-login";
 import { ROUTES } from "@/shared/config/routes";
 
-function OAuthCallbackContent() {
+function KakaoCallbackContent() {
   const router = useRouter();
   const searchParams = useSearchParams();
   const handledRef = useRef(false);
 
   useEffect(() => {
-    // 토큰 처리 중복 실행 방지
+    // 중복 실행 방지
     if (handledRef.current) return;
     handledRef.current = true;
 
-    const accessToken = searchParams.get("accessToken");
-    const refreshToken = searchParams.get("refreshToken");
-    // 백엔드 OAuth 실패 시 ?error=... 형태로 넘어오는 케이스 대비
+    const code = searchParams.get("code");
     const error = searchParams.get("error");
 
-    // 토큰이 없거나 에러가 있으면 로그인 페이지로 이동
-    if (error || !accessToken || !refreshToken) {
+    // 카카오 로그인 실패 시 ?error=... 형태로 넘어오는 케이스 대비
+    if (error || !code) {
       router.replace(ROUTES.login);
       return;
     }
 
     const handleCallback = async () => {
       try {
-        // 토큰을 URL에서 즉시 제거 (히스토리/Referer 헤더로 토큰 노출 방지)
-        window.history.replaceState({}, "", window.location.pathname);
+        // 1. 카카오 인가 코드 → access_token 교환 (Route Handler에서 처리)
+        const tokenRes = await fetch(`/api/oauth/kakao?code=${code}`);
+        if (!tokenRes.ok) {
+          router.replace(ROUTES.login);
+          return;
+        }
+        const { accessToken: kakaoAccessToken } = await tokenRes.json();
+
+        // 2. 카카오 access_token → 백엔드 JWT 발급
+        const { accessToken, refreshToken } = await loginWithKakao(kakaoAccessToken);
 
-        // httpOnly 쿠키는 서버에서만 set 가능하므로 Route Handler에 위임
+        // 3. httpOnly 쿠키에 저장
         const res = await fetch("/api/auth/token", {
           method: "POST",
           headers: { "Content-Type": "application/json" },
           body: JSON.stringify({ accessToken, refreshToken }),
           credentials: "include",
-          referrerPolicy: "no-referrer", // Referer 헤더로 토큰 노출 방지
+          referrerPolicy: "no-referrer",
         });
 
         if (res.ok) {
-          // router.replace는 서버 컴포넌트를 재실행하지 않아 네비게이션 상태가 바뀌지 않음
           // 풀 리로드로 쿠키 반영
           window.location.replace(ROUTES.home);
         } else {
@@ -58,10 +64,10 @@ function OAuthCallbackContent() {
   return <LoadingIndicator fullScreen text="로그인 처리 중" />;
 }
 
-export default function OAuthCallbackPage() {
+export default function KakaoCallbackPage() {
   return (
     <Suspense fallback={<LoadingIndicator fullScreen text="로그인 처리 중" />}>
-      <OAuthCallbackContent />
+      <KakaoCallbackContent />
     </Suspense>
   );
 }

From 879550283baeefcd76090a904b34b02d8748c762 Mon Sep 17 00:00:00 2001
From: Haesol Lee <haesol2022@naver.com>
Date: Thu, 16 Apr 2026 22:55:16 +0900
Subject: [PATCH 03/15] =?UTF-8?q?feat(web):=20layout=EC=97=90=20google=20i?=
 =?UTF-8?q?dentity=20services=20=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web/src/app/layout.tsx                    | 1 +
 apps/web/src/app/oauth/callback/kakao/page.tsx | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/apps/web/src/app/layout.tsx b/apps/web/src/app/layout.tsx
index 58757a69..5f6442d6 100644
--- a/apps/web/src/app/layout.tsx
+++ b/apps/web/src/app/layout.tsx
@@ -21,6 +21,7 @@ export default function RootLayout({
           crossOrigin=""
           href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard@v1.3.9/dist/web/variable/pretendardvariable-dynamic-subset.min.css"
         />
+        <script src="https://accounts.google.com/gsi/client" async />
       </head>
       <body className="bg-background-secondary antialiased">
         <AmplitudeInit />
diff --git a/apps/web/src/app/oauth/callback/kakao/page.tsx b/apps/web/src/app/oauth/callback/kakao/page.tsx
index 31c0d374..ed0759bb 100644
--- a/apps/web/src/app/oauth/callback/kakao/page.tsx
+++ b/apps/web/src/app/oauth/callback/kakao/page.tsx
@@ -27,7 +27,7 @@ function KakaoCallbackContent() {
 
     const handleCallback = async () => {
       try {
-        // 1. 카카오 인가 코드 → access_token 교환 (Route Handler에서 처리)
+        // 카카오 인가 코드 -> access_token 교환 (Route Handler에서 처리)
         const tokenRes = await fetch(`/api/oauth/kakao?code=${code}`);
         if (!tokenRes.ok) {
           router.replace(ROUTES.login);
@@ -35,10 +35,10 @@ function KakaoCallbackContent() {
         }
         const { accessToken: kakaoAccessToken } = await tokenRes.json();
 
-        // 2. 카카오 access_token → 백엔드 JWT 발급
+        // 카카오 access_token -> 백엔드 JWT 발급
         const { accessToken, refreshToken } = await loginWithKakao(kakaoAccessToken);
 
-        // 3. httpOnly 쿠키에 저장
+        // httpOnly 쿠키에 저장
         const res = await fetch("/api/auth/token", {
           method: "POST",
           headers: { "Content-Type": "application/json" },
@@ -48,7 +48,7 @@ function KakaoCallbackContent() {
         });
 
         if (res.ok) {
-          // 풀 리로드로 쿠키 반영
+          // 쿠키 반영을 위해 홈으로 새 요청 (클라이언트 이동 X)
           window.location.replace(ROUTES.home);
         } else {
           router.replace(ROUTES.login);

From 5e03f72caa9df2fa0c31a0705faf04a2eabd68ca Mon Sep 17 00:00:00 2001
From: Haesol Lee <haesol2022@naver.com>
Date: Thu, 16 Apr 2026 23:00:20 +0900
Subject: [PATCH 04/15] =?UTF-8?q?feat(web):=20=EC=86=8C=EC=85=9C=20?=
 =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20onClick=20=ED=95=B8=EB=93=A4?=
 =?UTF-8?q?=EB=9F=AC=EB=A5=BC=20=ED=86=A0=ED=81=B0=20=EC=A7=81=EC=A0=91=20?=
 =?UTF-8?q?=EC=A0=84=EB=8B=AC=20=EB=B0=A9=EC=8B=9D=EC=9C=BC=EB=A1=9C=20?=
 =?UTF-8?q?=EA=B5=90=EC=B2=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web/package.json                        |  1 +
 apps/web/src/features/auth/ui/login-form.tsx | 17 ++++++++++++++---
 pnpm-lock.yaml                               |  8 ++++++++
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/apps/web/package.json b/apps/web/package.json
index 7e8bbe44..75855cfa 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -43,6 +43,7 @@
     "@tailwindcss/postcss": "^4",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/react": "^16.3.2",
+    "@types/google-one-tap": "^1.2.7",
     "@types/node": "^20",
     "@types/react": "^19",
     "@types/react-dom": "^19",
diff --git a/apps/web/src/features/auth/ui/login-form.tsx b/apps/web/src/features/auth/ui/login-form.tsx
index b2ae8632..64188c0f 100644
--- a/apps/web/src/features/auth/ui/login-form.tsx
+++ b/apps/web/src/features/auth/ui/login-form.tsx
@@ -5,7 +5,7 @@ import Link from "next/link";
 import { startTransition, useActionState } from "react";
 import { useForm } from "react-hook-form";
 import { loginAction } from "@/_pages/auth/actions";
-import { getGoogleLoginUrl, getKakaoLoginUrl } from "@/_pages/auth/use-cases/social-login";
+import { loginWithGoogle } from "@/_pages/auth/use-cases/social-login";
 import { ROUTES } from "@/shared/config/routes";
 import { PasswordInput } from "./password-input";
 
@@ -98,14 +98,25 @@ export const LoginForm = () => {
           provider="google"
           className="w-full md:w-[222px]"
           onClick={() => {
-            window.location.href = getGoogleLoginUrl();
+            // Google Identity Services SDK로 팝업 띄워 access_token 획득 후 백엔드로 전달
+            const client = google.accounts.oauth2.initTokenClient({
+              client_id: process.env.NEXT_PUBLIC_GOOGLE_CLIENT_ID!,
+              scope: "email profile",
+              callback: async (response) => {
+                await loginWithGoogle(response.access_token);
+                // 쿠키 반영을 위해 홈으로 새 요청 (클라이언트 이동 X)
+                window.location.replace(ROUTES.home);
+              },
+            });
+            client.requestAccessToken();
           }}
         />
         <SocialButton
           provider="kakao"
           className="w-full md:w-[222px]"
           onClick={() => {
-            window.location.href = getKakaoLoginUrl();
+            // 카카오 로그인 페이지로 리다이렉트, 완료 후 /oauth/callback/kakao로 복귀
+            window.location.href = `https://kauth.kakao.com/oauth/authorize?client_id=${process.env.NEXT_PUBLIC_KAKAO_CLIENT_ID}&redirect_uri=${process.env.NEXT_PUBLIC_KAKAO_REDIRECT_URI}&response_type=code`;
           }}
         />
       </div>
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2b1f4d5b..b68d559e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -111,6 +111,9 @@ importers:
       '@testing-library/react':
         specifier: ^16.3.2
         version: 16.3.2(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+      '@types/google-one-tap':
+        specifier: ^1.2.7
+        version: 1.2.7
       '@types/node':
         specifier: ^20
         version: 20.19.37
@@ -3615,6 +3618,9 @@ packages:
   '@types/estree@1.0.8':
     resolution: {integrity: sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==}
 
+  '@types/google-one-tap@1.2.7':
+    resolution: {integrity: sha512-u+1J+ldj/ZvvBBP7a5zC+sWy5LaHVfcTcOW/aaTKYoWUlsWi6OCBYYN4dsPlYRmA08y9jag8MtcT5rVgYdPf1g==}
+
   '@types/json-schema@7.0.15':
     resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}
 
@@ -10209,6 +10215,8 @@ snapshots:
 
   '@types/estree@1.0.8': {}
 
+  '@types/google-one-tap@1.2.7': {}
+
   '@types/json-schema@7.0.15': {}
 
   '@types/linkify-it@5.0.0': {}

From b5f406754d55d64d7d64cd12369e524399f85ea4 Mon Sep 17 00:00:00 2001
From: Haesol Lee <haesol2022@naver.com>
Date: Thu, 16 Apr 2026 23:31:14 +0900
Subject: [PATCH 05/15] =?UTF-8?q?chore(web):=20google=20OAuth2=20=EC=A0=84?=
 =?UTF-8?q?=EC=97=AD=20=ED=83=80=EC=9E=85=20=EC=84=A0=EC=96=B8=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web/global.d.ts                          | 27 +++++++++++++++++++
 apps/web/src/features/auth/ui/login-form.tsx  |  4 +--
 apps/web/src/features/auth/ui/signup-form.tsx | 17 +++++++++---
 3 files changed, 42 insertions(+), 6 deletions(-)
 create mode 100644 apps/web/global.d.ts

diff --git a/apps/web/global.d.ts b/apps/web/global.d.ts
new file mode 100644
index 00000000..e69bf33c
--- /dev/null
+++ b/apps/web/global.d.ts
@@ -0,0 +1,27 @@
+declare namespace google {
+    namespace accounts {
+      namespace oauth2 {
+        interface TokenClient {
+          requestAccessToken(): void;
+        }
+  
+        interface TokenResponse {
+          access_token: string;
+        }
+  
+        function initTokenClient(config: {
+          client_id: string;
+          scope: string;
+          callback: (response: TokenResponse) => void;
+        }): TokenClient;
+      }
+    }
+  }
+  
+  declare global {
+    interface Window {
+      google: typeof google;
+    }
+  }
+  
+  export {};
\ No newline at end of file
diff --git a/apps/web/src/features/auth/ui/login-form.tsx b/apps/web/src/features/auth/ui/login-form.tsx
index 64188c0f..7f7c4087 100644
--- a/apps/web/src/features/auth/ui/login-form.tsx
+++ b/apps/web/src/features/auth/ui/login-form.tsx
@@ -98,13 +98,11 @@ export const LoginForm = () => {
           provider="google"
           className="w-full md:w-[222px]"
           onClick={() => {
-            // Google Identity Services SDK로 팝업 띄워 access_token 획득 후 백엔드로 전달
-            const client = google.accounts.oauth2.initTokenClient({
+            const client = window.google.accounts.oauth2.initTokenClient({
               client_id: process.env.NEXT_PUBLIC_GOOGLE_CLIENT_ID!,
               scope: "email profile",
               callback: async (response) => {
                 await loginWithGoogle(response.access_token);
-                // 쿠키 반영을 위해 홈으로 새 요청 (클라이언트 이동 X)
                 window.location.replace(ROUTES.home);
               },
             });
diff --git a/apps/web/src/features/auth/ui/signup-form.tsx b/apps/web/src/features/auth/ui/signup-form.tsx
index 45a60595..8ff881fb 100644
--- a/apps/web/src/features/auth/ui/signup-form.tsx
+++ b/apps/web/src/features/auth/ui/signup-form.tsx
@@ -4,7 +4,7 @@ import Link from "next/link";
 import { startTransition, useActionState } from "react";
 import { useForm } from "react-hook-form";
 import { signupAction } from "@/_pages/auth/actions";
-import { getGoogleLoginUrl, getKakaoLoginUrl } from "@/_pages/auth/use-cases/social-login";
+import { loginWithGoogle } from "@/_pages/auth/use-cases/social-login";
 import { ROUTES } from "@/shared/config/routes";
 import { PasswordInput } from "./password-input";
 
@@ -127,14 +127,25 @@ export const SignupForm = () => {
           provider="google"
           className="w-full md:w-[222px]"
           onClick={() => {
-            window.location.href = getGoogleLoginUrl();
+            // Google Identity Services SDK로 팝업 띄워 access_token 획득 후 백엔드로 전달
+            const client = google.accounts.oauth2.initTokenClient({
+              client_id: process.env.NEXT_PUBLIC_GOOGLE_CLIENT_ID!,
+              scope: "email profile",
+              callback: async (response) => {
+                await loginWithGoogle(response.access_token);
+                // 쿠키 반영을 위해 홈으로 새 요청 (클라이언트 이동 X)
+                window.location.replace(ROUTES.home);
+              },
+            });
+            client.requestAccessToken();
           }}
         />
         <SocialButton
           provider="kakao"
           className="w-full md:w-[222px]"
           onClick={() => {
-            window.location.href = getKakaoLoginUrl();
+            // 카카오 로그인 페이지로 리다이렉트, 완료 후 /oauth/callback/kakao로 복귀
+            window.location.href = `https://kauth.kakao.com/oauth/authorize?client_id=${process.env.NEXT_PUBLIC_KAKAO_CLIENT_ID}&redirect_uri=${process.env.NEXT_PUBLIC_KAKAO_REDIRECT_URI}&response_type=code`;
           }}
         />
       </div>

From 6879bcaea49256a24c02453886914df14ba282cc Mon Sep 17 00:00:00 2001
From: Haesol Lee <haesol2022@naver.com>
Date: Thu, 16 Apr 2026 23:41:12 +0900
Subject: [PATCH 06/15] =?UTF-8?q?fix(web):=20global.d.ts=20=ED=8C=8C?=
 =?UTF-8?q?=EC=9D=BC=20apps/web/src=20=EC=95=88=EC=9C=BC=EB=A1=9C=20?=
 =?UTF-8?q?=EC=9D=B4=EB=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web/{ => src}/global.d.ts | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename apps/web/{ => src}/global.d.ts (100%)

diff --git a/apps/web/global.d.ts b/apps/web/src/global.d.ts
similarity index 100%
rename from apps/web/global.d.ts
rename to apps/web/src/global.d.ts

From 3f14f4edee590dc2ea9acd1d155c37d72ffad86d Mon Sep 17 00:00:00 2001
From: Haesol Lee <haesol2022@naver.com>
Date: Fri, 17 Apr 2026 00:14:22 +0900
Subject: [PATCH 07/15] =?UTF-8?q?fix(web):=20google.accounts=20=ED=83=80?=
 =?UTF-8?q?=EC=9E=85=20=EC=97=90=EB=9F=AC=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web/package.json | 1 +
 pnpm-lock.yaml        | 8 ++++++++
 tsconfig.json         | 3 ++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/apps/web/package.json b/apps/web/package.json
index 75855cfa..0ae2f811 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -44,6 +44,7 @@
     "@testing-library/dom": "^10.4.1",
     "@testing-library/react": "^16.3.2",
     "@types/google-one-tap": "^1.2.7",
+    "@types/google.accounts": "^0.0.18",
     "@types/node": "^20",
     "@types/react": "^19",
     "@types/react-dom": "^19",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b68d559e..95accfa4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -114,6 +114,9 @@ importers:
       '@types/google-one-tap':
         specifier: ^1.2.7
         version: 1.2.7
+      '@types/google.accounts':
+        specifier: ^0.0.18
+        version: 0.0.18
       '@types/node':
         specifier: ^20
         version: 20.19.37
@@ -3621,6 +3624,9 @@ packages:
   '@types/google-one-tap@1.2.7':
     resolution: {integrity: sha512-u+1J+ldj/ZvvBBP7a5zC+sWy5LaHVfcTcOW/aaTKYoWUlsWi6OCBYYN4dsPlYRmA08y9jag8MtcT5rVgYdPf1g==}
 
+  '@types/google.accounts@0.0.18':
+    resolution: {integrity: sha512-yHaPznll97ZnMJlPABHyeiIlLn3u6gQaUjA5k/O9lrrpgFB9VT10CKPLuKM0qTHMl50uXpW5sIcG+utm8jMOHw==}
+
   '@types/json-schema@7.0.15':
     resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}
 
@@ -10217,6 +10223,8 @@ snapshots:
 
   '@types/google-one-tap@1.2.7': {}
 
+  '@types/google.accounts@0.0.18': {}
+
   '@types/json-schema@7.0.15': {}
 
   '@types/linkify-it@5.0.0': {}
diff --git a/tsconfig.json b/tsconfig.json
index ad632a35..1c97561a 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -14,7 +14,8 @@
     "isolatedModules": true,
     "jsx": "preserve",
     "incremental": true,
-    "baseUrl": "."
+    "baseUrl": ".",
+    "types": ["google.accounts"]
   },
   "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
   "exclude": ["node_modules"]

From 3f83a6d662f423a29d3480400b1e59af73c64522 Mon Sep 17 00:00:00 2001
From: Haesol Lee <haesol2022@naver.com>
Date: Fri, 17 Apr 2026 00:43:46 +0900
Subject: [PATCH 08/15] =?UTF-8?q?fix(web):=20=EA=B5=AC=EA=B8=80=20?=
 =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=ED=9B=84=20=EC=BF=A0=ED=82=A4=20?=
 =?UTF-8?q?=EC=A0=80=EC=9E=A5=20=EB=88=84=EB=9D=BD=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web/src/app/layout.tsx                   |  3 ++-
 apps/web/src/features/auth/ui/login-form.tsx  |  8 +++++++-
 apps/web/src/features/auth/ui/signup-form.tsx | 12 ++++++++----
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/apps/web/src/app/layout.tsx b/apps/web/src/app/layout.tsx
index 5f6442d6..53a3d36c 100644
--- a/apps/web/src/app/layout.tsx
+++ b/apps/web/src/app/layout.tsx
@@ -1,5 +1,6 @@
 import type { Metadata } from "next";
 import "./globals.css";
+import Script from "next/script";
 import { AmplitudeInit } from "@/amplitude";
 
 export const metadata: Metadata = {
@@ -21,9 +22,9 @@ export default function RootLayout({
           crossOrigin=""
           href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard@v1.3.9/dist/web/variable/pretendardvariable-dynamic-subset.min.css"
         />
-        <script src="https://accounts.google.com/gsi/client" async />
       </head>
       <body className="bg-background-secondary antialiased">
+        <Script src="https://accounts.google.com/gsi/client" strategy="beforeInteractive" />
         <AmplitudeInit />
         {children}
       </body>
diff --git a/apps/web/src/features/auth/ui/login-form.tsx b/apps/web/src/features/auth/ui/login-form.tsx
index 7f7c4087..32d40626 100644
--- a/apps/web/src/features/auth/ui/login-form.tsx
+++ b/apps/web/src/features/auth/ui/login-form.tsx
@@ -98,11 +98,17 @@ export const LoginForm = () => {
           provider="google"
           className="w-full md:w-[222px]"
           onClick={() => {
+            // 구글 팝업으로 access_token 획득 후 백엔드로 전달
             const client = window.google.accounts.oauth2.initTokenClient({
               client_id: process.env.NEXT_PUBLIC_GOOGLE_CLIENT_ID!,
               scope: "email profile",
               callback: async (response) => {
-                await loginWithGoogle(response.access_token);
+                const { accessToken, refreshToken } = await loginWithGoogle(response.access_token);
+                await fetch("/api/auth/token", {
+                  method: "POST",
+                  headers: { "Content-Type": "application/json" },
+                  body: JSON.stringify({ accessToken, refreshToken }),
+                });
                 window.location.replace(ROUTES.home);
               },
             });
diff --git a/apps/web/src/features/auth/ui/signup-form.tsx b/apps/web/src/features/auth/ui/signup-form.tsx
index 8ff881fb..3fa0f2a7 100644
--- a/apps/web/src/features/auth/ui/signup-form.tsx
+++ b/apps/web/src/features/auth/ui/signup-form.tsx
@@ -127,13 +127,17 @@ export const SignupForm = () => {
           provider="google"
           className="w-full md:w-[222px]"
           onClick={() => {
-            // Google Identity Services SDK로 팝업 띄워 access_token 획득 후 백엔드로 전달
-            const client = google.accounts.oauth2.initTokenClient({
+            // 구글 팝업으로 access_token 획득 후 백엔드로 전달
+            const client = window.google.accounts.oauth2.initTokenClient({
               client_id: process.env.NEXT_PUBLIC_GOOGLE_CLIENT_ID!,
               scope: "email profile",
               callback: async (response) => {
-                await loginWithGoogle(response.access_token);
-                // 쿠키 반영을 위해 홈으로 새 요청 (클라이언트 이동 X)
+                const { accessToken, refreshToken } = await loginWithGoogle(response.access_token);
+                await fetch("/api/auth/token", {
+                  method: "POST",
+                  headers: { "Content-Type": "application/json" },
+                  body: JSON.stringify({ accessToken, refreshToken }),
+                });
                 window.location.replace(ROUTES.home);
               },
             });

From 4e92a1416eaec2f695e60ec398966df9930d6655 Mon Sep 17 00:00:00 2001
From: Haesol Lee <haesol2022@naver.com>
Date: Fri, 17 Apr 2026 00:46:20 +0900
Subject: [PATCH 09/15] =?UTF-8?q?fix(web):=20fix:=20tsconfig=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20google.accounts=20types=20=EC=84=A4=EC=A0=95=20?=
 =?UTF-8?q?=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tsconfig.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tsconfig.json b/tsconfig.json
index 1c97561a..ad632a35 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -14,8 +14,7 @@
     "isolatedModules": true,
     "jsx": "preserve",
     "incremental": true,
-    "baseUrl": ".",
-    "types": ["google.accounts"]
+    "baseUrl": "."
   },
   "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
   "exclude": ["node_modules"]

From ceca9fcd70b905ac19f6912208971a270dd7dcc9 Mon Sep 17 00:00:00 2001
From: Haesol Lee <haesol2022@naver.com>
Date: Fri, 17 Apr 2026 09:56:12 +0900
Subject: [PATCH 10/15] =?UTF-8?q?fix(web):=20=EC=86=8C=EC=85=9C=20?=
 =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=97=90=EB=9F=AC=20=EC=B2=98?=
 =?UTF-8?q?=EB=A6=AC=20=EB=B0=8F=20=EC=B9=B4=EC=B9=B4=EC=98=A4=20redirect?=
 =?UTF-8?q?=5Furi=20=EC=9D=B8=EC=BD=94=EB=94=A9=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web/src/features/auth/ui/login-form.tsx  | 28 +++++++++-------
 apps/web/src/features/auth/ui/signup-form.tsx | 28 +++++++++-------
 apps/web/src/global.d.ts                      | 32 ++++---------------
 3 files changed, 40 insertions(+), 48 deletions(-)

diff --git a/apps/web/src/features/auth/ui/login-form.tsx b/apps/web/src/features/auth/ui/login-form.tsx
index 32d40626..179c4090 100644
--- a/apps/web/src/features/auth/ui/login-form.tsx
+++ b/apps/web/src/features/auth/ui/login-form.tsx
@@ -1,7 +1,8 @@
 "use client";
 
-import { Button, InputField, SocialButton } from "@moum-zip/ui/components";
+import { Button, InputField, SocialButton, toast } from "@moum-zip/ui/components";
 import Link from "next/link";
+import { useRouter } from "next/router";
 import { startTransition, useActionState } from "react";
 import { useForm } from "react-hook-form";
 import { loginAction } from "@/_pages/auth/actions";
@@ -22,6 +23,7 @@ const ERROR_MESSAGES = {
 
 export const LoginForm = () => {
   const [state, formAction, isPending] = useActionState(loginAction, null);
+  const router = useRouter();
 
   const {
     register,
@@ -98,18 +100,23 @@ export const LoginForm = () => {
           provider="google"
           className="w-full md:w-[222px]"
           onClick={() => {
-            // 구글 팝업으로 access_token 획득 후 백엔드로 전달
             const client = window.google.accounts.oauth2.initTokenClient({
               client_id: process.env.NEXT_PUBLIC_GOOGLE_CLIENT_ID!,
               scope: "email profile",
               callback: async (response) => {
-                const { accessToken, refreshToken } = await loginWithGoogle(response.access_token);
-                await fetch("/api/auth/token", {
-                  method: "POST",
-                  headers: { "Content-Type": "application/json" },
-                  body: JSON.stringify({ accessToken, refreshToken }),
-                });
-                window.location.replace(ROUTES.home);
+                try {
+                  const { accessToken, refreshToken } = await loginWithGoogle(response.access_token);
+                  const res = await fetch("/api/auth/token", {
+                    method: "POST",
+                    headers: { "Content-Type": "application/json" },
+                    body: JSON.stringify({ accessToken, refreshToken }),
+                  });
+                  if (!res.ok) throw new Error("토큰 저장 실패");
+                  window.location.replace(ROUTES.home);
+                } catch {
+                  toast({ message: "로그인 중 오류가 발생했어요. 다시 시도해주세요.", size: "small" });
+                  router.replace(ROUTES.login);
+                }
               },
             });
             client.requestAccessToken();
@@ -119,8 +126,7 @@ export const LoginForm = () => {
           provider="kakao"
           className="w-full md:w-[222px]"
           onClick={() => {
-            // 카카오 로그인 페이지로 리다이렉트, 완료 후 /oauth/callback/kakao로 복귀
-            window.location.href = `https://kauth.kakao.com/oauth/authorize?client_id=${process.env.NEXT_PUBLIC_KAKAO_CLIENT_ID}&redirect_uri=${process.env.NEXT_PUBLIC_KAKAO_REDIRECT_URI}&response_type=code`;
+            window.location.href = `https://kauth.kakao.com/oauth/authorize?client_id=${process.env.NEXT_PUBLIC_KAKAO_CLIENT_ID}&redirect_uri=${encodeURIComponent(process.env.NEXT_PUBLIC_KAKAO_REDIRECT_URI!)}&response_type=code`;
           }}
         />
       </div>
diff --git a/apps/web/src/features/auth/ui/signup-form.tsx b/apps/web/src/features/auth/ui/signup-form.tsx
index 3fa0f2a7..810ccb99 100644
--- a/apps/web/src/features/auth/ui/signup-form.tsx
+++ b/apps/web/src/features/auth/ui/signup-form.tsx
@@ -1,6 +1,7 @@
 "use client";
-import { Button, InputField, SocialButton } from "@moum-zip/ui/components";
+import { Button, InputField, SocialButton, toast } from "@moum-zip/ui/components";
 import Link from "next/link";
+import { useRouter } from "next/navigation";
 import { startTransition, useActionState } from "react";
 import { useForm } from "react-hook-form";
 import { signupAction } from "@/_pages/auth/actions";
@@ -24,6 +25,7 @@ const ERROR_MESSAGES = {
 export const SignupForm = () => {
   // 서버 액션 상태 관리
   const [state, formAction, isPending] = useActionState(signupAction, null);
+  const router = useRouter();
 
   const {
     register,
@@ -127,18 +129,23 @@ export const SignupForm = () => {
           provider="google"
           className="w-full md:w-[222px]"
           onClick={() => {
-            // 구글 팝업으로 access_token 획득 후 백엔드로 전달
             const client = window.google.accounts.oauth2.initTokenClient({
               client_id: process.env.NEXT_PUBLIC_GOOGLE_CLIENT_ID!,
               scope: "email profile",
               callback: async (response) => {
-                const { accessToken, refreshToken } = await loginWithGoogle(response.access_token);
-                await fetch("/api/auth/token", {
-                  method: "POST",
-                  headers: { "Content-Type": "application/json" },
-                  body: JSON.stringify({ accessToken, refreshToken }),
-                });
-                window.location.replace(ROUTES.home);
+                try {
+                  const { accessToken, refreshToken } = await loginWithGoogle(response.access_token);
+                  const res = await fetch("/api/auth/token", {
+                    method: "POST",
+                    headers: { "Content-Type": "application/json" },
+                    body: JSON.stringify({ accessToken, refreshToken }),
+                  });
+                  if (!res.ok) throw new Error("토큰 저장 실패");
+                  window.location.replace(ROUTES.home);
+                } catch {
+                  toast({ message: "회원가입 중 오류가 발생했어요. 다시 시도해주세요.", size: "small" });
+                  router.replace(ROUTES.login);
+                }
               },
             });
             client.requestAccessToken();
@@ -148,8 +155,7 @@ export const SignupForm = () => {
           provider="kakao"
           className="w-full md:w-[222px]"
           onClick={() => {
-            // 카카오 로그인 페이지로 리다이렉트, 완료 후 /oauth/callback/kakao로 복귀
-            window.location.href = `https://kauth.kakao.com/oauth/authorize?client_id=${process.env.NEXT_PUBLIC_KAKAO_CLIENT_ID}&redirect_uri=${process.env.NEXT_PUBLIC_KAKAO_REDIRECT_URI}&response_type=code`;
+            window.location.href = `https://kauth.kakao.com/oauth/authorize?client_id=${process.env.NEXT_PUBLIC_KAKAO_CLIENT_ID}&redirect_uri=${encodeURIComponent(process.env.NEXT_PUBLIC_KAKAO_REDIRECT_URI!)}&response_type=code`;
           }}
         />
       </div>
diff --git a/apps/web/src/global.d.ts b/apps/web/src/global.d.ts
index e69bf33c..aa0aa4d9 100644
--- a/apps/web/src/global.d.ts
+++ b/apps/web/src/global.d.ts
@@ -1,27 +1,7 @@
-declare namespace google {
-    namespace accounts {
-      namespace oauth2 {
-        interface TokenClient {
-          requestAccessToken(): void;
-        }
-  
-        interface TokenResponse {
-          access_token: string;
-        }
-  
-        function initTokenClient(config: {
-          client_id: string;
-          scope: string;
-          callback: (response: TokenResponse) => void;
-        }): TokenClient;
-      }
-    }
+declare global {
+  interface Window {
+    google: typeof google;
   }
-  
-  declare global {
-    interface Window {
-      google: typeof google;
-    }
-  }
-  
-  export {};
\ No newline at end of file
+}
+
+export {};
\ No newline at end of file

From fdc2da54c2ae037f61d1ccf6aec52217d795b721 Mon Sep 17 00:00:00 2001
From: Haesol Lee <haesol2022@naver.com>
Date: Fri, 17 Apr 2026 10:26:18 +0900
Subject: [PATCH 11/15] =?UTF-8?q?fix(web):=20useRouter=20=EC=82=AD?=
 =?UTF-8?q?=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web/src/features/auth/ui/login-form.tsx  |  4 +--
 apps/web/src/features/auth/ui/signup-form.tsx |  4 +--
 apps/web/src/global.d.ts                      | 32 +++++++++++++++----
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/apps/web/src/features/auth/ui/login-form.tsx b/apps/web/src/features/auth/ui/login-form.tsx
index 179c4090..62b990fa 100644
--- a/apps/web/src/features/auth/ui/login-form.tsx
+++ b/apps/web/src/features/auth/ui/login-form.tsx
@@ -2,7 +2,6 @@
 
 import { Button, InputField, SocialButton, toast } from "@moum-zip/ui/components";
 import Link from "next/link";
-import { useRouter } from "next/router";
 import { startTransition, useActionState } from "react";
 import { useForm } from "react-hook-form";
 import { loginAction } from "@/_pages/auth/actions";
@@ -23,7 +22,6 @@ const ERROR_MESSAGES = {
 
 export const LoginForm = () => {
   const [state, formAction, isPending] = useActionState(loginAction, null);
-  const router = useRouter();
 
   const {
     register,
@@ -115,7 +113,7 @@ export const LoginForm = () => {
                   window.location.replace(ROUTES.home);
                 } catch {
                   toast({ message: "로그인 중 오류가 발생했어요. 다시 시도해주세요.", size: "small" });
-                  router.replace(ROUTES.login);
+                  window.location.replace(ROUTES.login);
                 }
               },
             });
diff --git a/apps/web/src/features/auth/ui/signup-form.tsx b/apps/web/src/features/auth/ui/signup-form.tsx
index 810ccb99..65fd47e2 100644
--- a/apps/web/src/features/auth/ui/signup-form.tsx
+++ b/apps/web/src/features/auth/ui/signup-form.tsx
@@ -1,7 +1,6 @@
 "use client";
 import { Button, InputField, SocialButton, toast } from "@moum-zip/ui/components";
 import Link from "next/link";
-import { useRouter } from "next/navigation";
 import { startTransition, useActionState } from "react";
 import { useForm } from "react-hook-form";
 import { signupAction } from "@/_pages/auth/actions";
@@ -25,7 +24,6 @@ const ERROR_MESSAGES = {
 export const SignupForm = () => {
   // 서버 액션 상태 관리
   const [state, formAction, isPending] = useActionState(signupAction, null);
-  const router = useRouter();
 
   const {
     register,
@@ -144,7 +142,7 @@ export const SignupForm = () => {
                   window.location.replace(ROUTES.home);
                 } catch {
                   toast({ message: "회원가입 중 오류가 발생했어요. 다시 시도해주세요.", size: "small" });
-                  router.replace(ROUTES.login);
+                  window.location.replace(ROUTES.signup);
                 }
               },
             });
diff --git a/apps/web/src/global.d.ts b/apps/web/src/global.d.ts
index aa0aa4d9..e69bf33c 100644
--- a/apps/web/src/global.d.ts
+++ b/apps/web/src/global.d.ts
@@ -1,7 +1,27 @@
-declare global {
-  interface Window {
-    google: typeof google;
+declare namespace google {
+    namespace accounts {
+      namespace oauth2 {
+        interface TokenClient {
+          requestAccessToken(): void;
+        }
+  
+        interface TokenResponse {
+          access_token: string;
+        }
+  
+        function initTokenClient(config: {
+          client_id: string;
+          scope: string;
+          callback: (response: TokenResponse) => void;
+        }): TokenClient;
+      }
+    }
   }
-}
-
-export {};
\ No newline at end of file
+  
+  declare global {
+    interface Window {
+      google: typeof google;
+    }
+  }
+  
+  export {};
\ No newline at end of file

From bf487574d1d421b1c352bf7f6a2a92f718c90aeb Mon Sep 17 00:00:00 2001
From: Haesol Lee <haesol2022@naver.com>
Date: Fri, 17 Apr 2026 10:51:20 +0900
Subject: [PATCH 12/15] =?UTF-8?q?chore(web):=20@types/google.accounts=20?=
 =?UTF-8?q?=ED=83=80=EC=9E=85=20=EC=A0=81=EC=9A=A9=20=EB=B0=8F=20global.d.?=
 =?UTF-8?q?ts=20=EA=B0=84=EC=86=8C=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web/src/global.d.ts | 32 ++++++--------------------------
 tsconfig.json            |  3 ++-
 2 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/apps/web/src/global.d.ts b/apps/web/src/global.d.ts
index e69bf33c..aa0aa4d9 100644
--- a/apps/web/src/global.d.ts
+++ b/apps/web/src/global.d.ts
@@ -1,27 +1,7 @@
-declare namespace google {
-    namespace accounts {
-      namespace oauth2 {
-        interface TokenClient {
-          requestAccessToken(): void;
-        }
-  
-        interface TokenResponse {
-          access_token: string;
-        }
-  
-        function initTokenClient(config: {
-          client_id: string;
-          scope: string;
-          callback: (response: TokenResponse) => void;
-        }): TokenClient;
-      }
-    }
+declare global {
+  interface Window {
+    google: typeof google;
   }
-  
-  declare global {
-    interface Window {
-      google: typeof google;
-    }
-  }
-  
-  export {};
\ No newline at end of file
+}
+
+export {};
\ No newline at end of file
diff --git a/tsconfig.json b/tsconfig.json
index ad632a35..1c97561a 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -14,7 +14,8 @@
     "isolatedModules": true,
     "jsx": "preserve",
     "incremental": true,
-    "baseUrl": "."
+    "baseUrl": ".",
+    "types": ["google.accounts"]
   },
   "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
   "exclude": ["node_modules"]

From f3af50fe5711eaecd2948f76cda873e98553a145 Mon Sep 17 00:00:00 2001
From: Haesol Lee <haesol2022@naver.com>
Date: Fri, 17 Apr 2026 10:54:44 +0900
Subject: [PATCH 13/15] =?UTF-8?q?fix(web):=20tokenResponse=20=ED=83=80?=
 =?UTF-8?q?=EC=9E=85=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web/src/global.d.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/apps/web/src/global.d.ts b/apps/web/src/global.d.ts
index aa0aa4d9..b52dd817 100644
--- a/apps/web/src/global.d.ts
+++ b/apps/web/src/global.d.ts
@@ -1,3 +1,10 @@
+declare namespace google.accounts.oauth2 {
+  interface TokenResponse {
+    error?: string;
+    error_description?: string;
+  }
+}
+
 declare global {
   interface Window {
     google: typeof google;

From f8a5a252bf104347691b3198408840b8eb386931 Mon Sep 17 00:00:00 2001
From: Haesol Lee <haesol2022@naver.com>
Date: Fri, 17 Apr 2026 11:05:51 +0900
Subject: [PATCH 14/15] =?UTF-8?q?fix(web):=20=20=EC=B9=B4=EC=B9=B4?=
 =?UTF-8?q?=EC=98=A4=20=ED=86=A0=ED=81=B0=20=EC=9D=91=EB=8B=B5=20access=5F?=
 =?UTF-8?q?token=20=EA=B2=80=EC=A6=9D=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web/src/app/api/oauth/kakao/route.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/web/src/app/api/oauth/kakao/route.ts b/apps/web/src/app/api/oauth/kakao/route.ts
index c0d79d1a..f90f05c1 100644
--- a/apps/web/src/app/api/oauth/kakao/route.ts
+++ b/apps/web/src/app/api/oauth/kakao/route.ts
@@ -28,5 +28,9 @@ export async function GET(request: NextRequest) {
 
   const { access_token } = await tokenRes.json();
 
+  if (!access_token) {
+    return NextResponse.json({ message: "카카오 토큰 응답 오류" }, { status: 400 });
+  }
+
   return NextResponse.json({ accessToken: access_token });
 }

From 4319350f15221ee01b0e6cdd9ab985fe4a48e3ed Mon Sep 17 00:00:00 2001
From: Haesol Lee <haesol2022@naver.com>
Date: Fri, 17 Apr 2026 11:14:48 +0900
Subject: [PATCH 15/15] =?UTF-8?q?fix(web):=20api=5Fbase=5Furl=20trailing?=
 =?UTF-8?q?=20slash=20=EC=A0=95=EA=B7=9C=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web/src/shared/config/env.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/web/src/shared/config/env.ts b/apps/web/src/shared/config/env.ts
index feb684a2..7c2f315f 100644
--- a/apps/web/src/shared/config/env.ts
+++ b/apps/web/src/shared/config/env.ts
@@ -1,3 +1,6 @@
-export const API_BASE_URL = process.env.NEXT_PUBLIC_API_URL ?? "https://together-dallaem-api.vercel.app";
+export const API_BASE_URL = (process.env.NEXT_PUBLIC_API_URL ?? "https://together-dallaem-api.vercel.app").replace(
+  /\/+$/,
+  "",
+);
 
 export const TEAM_ID = process.env.NEXT_PUBLIC_TEAM_ID ?? "moum-zip-dev";