diff --git a/.env.development b/.env.development index 82c4f5a..0f8dbea 100644 --- a/.env.development +++ b/.env.development @@ -5,3 +5,4 @@ ENV=dev CONTACT_SERVER=http://127.0.0.1:4001 API_CONTACT_SERVER=http://127.0.0.1:4001/api/v1 API_INTRANET_SERVER=https://intranet-ext.kric.com/api/v1 +AUTH_COOKIE_DOMAIN=kric.com \ No newline at end of file diff --git a/.env.production b/.env.production index d58e69e..468263b 100644 --- a/.env.production +++ b/.env.production @@ -5,3 +5,4 @@ ENV=prod CONTACT_SERVER=http://127.0.0.1:4001 API_CONTACT_SERVER=http://127.0.0.1:4001/api/v1 API_INTRANET_SERVER=https://intranet-ext.kric.com/api/v1 +AUTH_COOKIE_DOMAIN=kric.com diff --git a/src/app/api/login/route.ts b/src/app/api/login/route.ts index 9ae3703..a90d4df 100644 --- a/src/app/api/login/route.ts +++ b/src/app/api/login/route.ts @@ -1,9 +1,8 @@ import { NextRequest, NextResponse } from "next/server"; import type { LoginRequest, LoginUser } from "@kri/common"; -import {serverEnv} from "@/lib/env.server"; +import {setAuthCookie} from "@/lib/auth-cookie"; import {createContactApi} from "@/lib/http-server"; import {errorToResponse} from "@kri/common/http"; -import {CookieKeys} from "@/store/cookie/cookie-keys"; //?ㅼ젣 Backend type LoginResponse = { @@ -19,13 +18,7 @@ export const POST = async (req: NextRequest) => { const result = await contactApi.post("/auth/login", body); const res = NextResponse.json(result.user, { status: 200 }); - res.cookies.set(CookieKeys.AuthToken, result.accessToken, { - httpOnly: true, - secure: serverEnv.ENV === "prod", - sameSite: "lax", - path: "/", - maxAge: 24 * 60 * 60, // 24?쒓컙 - }); + setAuthCookie(res, result.accessToken); return res; } catch (error : unknown) { diff --git a/src/app/api/logout/[[...slug]]/route.ts b/src/app/api/logout/[[...slug]]/route.ts index 43a8067..dc1b58c 100644 --- a/src/app/api/logout/[[...slug]]/route.ts +++ b/src/app/api/logout/[[...slug]]/route.ts @@ -1,9 +1,8 @@ import { NextRequest, NextResponse } from "next/server"; -import {serverEnv} from "@/lib/env.server"; +import {setAuthCookie} from "@/lib/auth-cookie"; import {createContactApi} from "@/lib/http-server"; import {errorToResponse} from "@kri/common/http"; import {RouteContext} from "@/types/common"; -import {CookieKeys} from "@/store/cookie/cookie-keys"; export async function POST( _req: NextRequest, @@ -22,13 +21,7 @@ export async function POST( await contactApi.post(url); const res = NextResponse.json({ ok: true }); - res.cookies.set(CookieKeys.AuthToken, "", { - httpOnly: true, - secure: serverEnv.ENV === "prod", - sameSite: "lax", - path: "/", - maxAge: 0, - }); + setAuthCookie(res, ""); return res; } catch (error: unknown) { diff --git a/src/lib/auth-cookie.ts b/src/lib/auth-cookie.ts new file mode 100644 index 0000000..2128c7a --- /dev/null +++ b/src/lib/auth-cookie.ts @@ -0,0 +1,31 @@ +import "server-only"; + +import { NextResponse } from "next/server"; +import { serverEnv } from "@/lib/env.server"; +import { CookieKeys } from "@/store/cookie/cookie-keys"; + +export const setAuthCookie = (response: NextResponse, token: string) => { + const secure = serverEnv.ENV === "prod"; + const options = { + httpOnly: true, + secure, + sameSite: "lax", + path: "/", + } as const; + const domain = secure ? serverEnv.AUTH_COOKIE_DOMAIN : undefined; + + response.cookies.set(CookieKeys.AuthToken, token, { + ...options, + ...(domain ? { domain } : {}), + maxAge: token ? 24 * 60 * 60 : 0, + }); + + if (domain) { + // Expire the legacy host-only cookie without replacing the shared cookie header. + const legacy = new NextResponse(); + legacy.cookies.set(CookieKeys.AuthToken, "", { ...options, maxAge: 0 }); + for (const cookie of legacy.headers.getSetCookie()) { + response.headers.append("Set-Cookie", cookie); + } + } +}; diff --git a/src/lib/env.server.ts b/src/lib/env.server.ts index ba9b650..1aa152b 100644 --- a/src/lib/env.server.ts +++ b/src/lib/env.server.ts @@ -5,6 +5,8 @@ import { createEnv, env } from "@kri/common/config"; export const serverEnv = createEnv({ ENV: env.required("ENV", process.env.ENV), + AUTH_COOKIE_DOMAIN: env.optional("AUTH_COOKIE_DOMAIN", process.env.AUTH_COOKIE_DOMAIN), + CONTACT_SERVER: env.required("CONTACT_SERVER", process.env.CONTACT_SERVER), API_CONTACT_SERVER: env.required("API_CONTACT_SERVER", process.env.API_CONTACT_SERVER),