diff --git a/apps/as/app/api/proxy/[...url]/route.ts b/apps/as/app/api/proxy/[...url]/route.ts index 15abf4c72..b32008942 100644 --- a/apps/as/app/api/proxy/[...url]/route.ts +++ b/apps/as/app/api/proxy/[...url]/route.ts @@ -5,6 +5,7 @@ import { ACCESS_TOKEN, AUTH_USER_ID, CLAIM_NAME, + COOKIE_DOMAIN, REFRESH_TOKEN, SERVER_API_URL, SITE_ID, @@ -20,6 +21,10 @@ async function handler( "Content-Type": "application/json", "X-Site-Id": SITE_ID, }; + const deviceId = request.headers.get("X-Device-Id"); + if (deviceId) { + headers["X-Device-Id"] = deviceId; + } let body = {}; const isRefreshHandler = params.url.includes("refresh"); @@ -39,27 +44,13 @@ async function handler( } const targetUrl = `${SERVER_API_URL}/${params.url.join("/")}`; - console.log(`[Proxy API] ${method} ${params.url.join("/")} -> ${targetUrl}`); - console.log(`[Proxy API] Headers:`, headers); - if (!isRefreshHandler) { - console.log(`[Proxy API] Body:`, body); - } - const result = await fetch(targetUrl, { method, headers, body: JSON.stringify(body), }); - console.log(`[Proxy API] Response Status: ${result.status}`); - console.log(`[Proxy API] Response Headers:`, { - [ACCESS_TOKEN]: result.headers.get(ACCESS_TOKEN), - [REFRESH_TOKEN]: result.headers.get(REFRESH_TOKEN) ? '***hidden***' : undefined, - [AUTH_USER_ID]: result.headers.get(AUTH_USER_ID), - }); - if (!result.ok) { - console.error(`[Proxy API] Request failed with status ${result.status}`); return NextResponse.json({ message: "Invalid Credentials" }, { status: 401 }); } @@ -68,24 +59,16 @@ async function handler( const userId = result.headers.get(AUTH_USER_ID); if (accessToken && userId) { - console.log(`[Proxy API] Login successful for user: ${userId}`); const response = NextResponse.json({ [ACCESS_TOKEN]: accessToken, [AUTH_USER_ID]: userId, }); - const forwardedHost = request.headers.get("x-forwarded-host"); - const host = request.headers.get("host"); - const actualHost = forwardedHost || host || new URL(request.url).hostname.toString(); - - // 운영 환경에서 domain 설정 - const domain = actualHost.includes("hasuon.or.kr") ? ".hasuon.or.kr" : actualHost; - if (refreshToken) { cookieStore.set(REFRESH_TOKEN, refreshToken, { httpOnly: true, sameSite: "strict", - domain: domain, + domain: getCookieDomain(), path: "/", }); } @@ -109,3 +92,14 @@ export async function PUT(request: Request, props: { params: Promise<{ url: stri const params = await props.params; return handler(request, params, "PUT"); } + +function getCookieDomain(): string | undefined { + if (typeof window === "undefined") return undefined; + + if (COOKIE_DOMAIN) return COOKIE_DOMAIN; + + const { hostname } = window.location; + if (hostname === "localhost" || hostname === "127.0.0.1") return undefined; + + return hostname; +} diff --git a/apps/as/package.json b/apps/as/package.json index ed4016352..cebdf28ee 100644 --- a/apps/as/package.json +++ b/apps/as/package.json @@ -32,6 +32,7 @@ "next": "15.5.18", "react-hook-form": "^7.54.2", "tus-js-client": "^4.3.1", + "uuid": "^14.0.1", "zod": "^3.24.2" }, "devDependencies": { diff --git a/apps/as/src/entities/auth/api/auth-service.ts b/apps/as/src/entities/auth/api/auth-service.ts index 97b664d6f..934471c50 100644 --- a/apps/as/src/entities/auth/api/auth-service.ts +++ b/apps/as/src/entities/auth/api/auth-service.ts @@ -1,6 +1,7 @@ import { ACCESS_TOKEN, AUTH_USER_ID, CLAIM_NAME, ENDPOINT } from "@/shared/config"; import { type AuthPayload, type AuthService, getRemainingMs } from "@common/auth"; +import { clearDeviceId, getOrCreateDeviceId } from "../lib/device-id"; import { clearRefreshTimer, removeToken, @@ -12,7 +13,10 @@ import { async function login(payload: AuthPayload): Promise { const response = await fetch(`/api/proxy${ENDPOINT.USER_SERVICE.LOGIN}`, { method: "POST", - headers: { "Content-Type": "application/json" }, + headers: { + "Content-Type": "application/json", + "X-Device-Id": getOrCreateDeviceId(), + }, body: JSON.stringify(payload), }); @@ -39,6 +43,9 @@ async function silentRefresh(): Promise { try { const response = await fetch(`/api/proxy${ENDPOINT.USER_SERVICE.SILENT_REFRESH}`, { method: "PUT", + headers: { + "X-Device-Id": getOrCreateDeviceId(), + }, }); const data = await response.json(); @@ -74,6 +81,7 @@ async function logout(): Promise { tokenManager.clearAuthToken(); removeToken("site-id-key"); removeToken("site-theme-key"); + clearDeviceId(); if (typeof window !== "undefined") { window.dispatchEvent(new CustomEvent("auth:logout")); diff --git a/apps/as/src/entities/auth/lib/device-id.ts b/apps/as/src/entities/auth/lib/device-id.ts new file mode 100644 index 000000000..ce173b141 --- /dev/null +++ b/apps/as/src/entities/auth/lib/device-id.ts @@ -0,0 +1,17 @@ +import { v4 as uuidv4 } from "uuid"; + +const DEVICE_ID_KEY = "x-device-id"; + +export function getOrCreateDeviceId(): string { + if (typeof window === "undefined") return ""; + const existing = localStorage.getItem(DEVICE_ID_KEY); + if (existing) return existing; + const id = uuidv4(); + localStorage.setItem(DEVICE_ID_KEY, id); + return id; +} + +export function clearDeviceId(): void { + if (typeof window === "undefined") return; + localStorage.removeItem(DEVICE_ID_KEY); +} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b9da50e6a..d59b101f1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -195,6 +195,9 @@ importers: tus-js-client: specifier: ^4.3.1 version: 4.3.1 + uuid: + specifier: ^14.0.1 + version: 14.0.1 zod: specifier: ^3.24.2 version: 3.25.76 @@ -7360,8 +7363,13 @@ packages: utrie@1.0.2: resolution: {integrity: sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==} + uuid@14.0.1: + resolution: {integrity: sha512-6ZxzVpzDXDa3bJWaHilVayA+BH/1zmxCJoVgvmqJnid/gPoKHxUrS/aC/T6LGQtNHT+XHG9fXPJB4d+IrU30Ew==} + hasBin: true + uuid@9.0.1: resolution: {integrity: sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==} + deprecated: uuid@10 and below is no longer supported. For ESM codebases, update to uuid@latest. For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028). hasBin: true victory-vendor@36.9.2: @@ -13476,6 +13484,8 @@ snapshots: dependencies: base64-arraybuffer: 1.0.2 + uuid@14.0.1: {} + uuid@9.0.1: {} victory-vendor@36.9.2: