From cbd0a559e97d6dc430d94b2f77f9f70125ef9bdc Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Mon, 2 Nov 2026 15:55:25 +0900 Subject: [PATCH] =?UTF-8?q?261102=5F02=5FENH:=20=EA=B3=B5=EC=9A=A9=20?= =?UTF-8?q?=EC=9D=B8=EC=A6=9D=20=EC=BF=A0=ED=82=A4=20=EB=8F=84=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=20=EC=A0=81=EC=9A=A9=20=EC=A1=B0=EA=B1=B4=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=EB=B0=8F=20=EC=99=B8=EB=B6=80=20=EB=A7=81=ED=81=AC?= =?UTF-8?q?=20=EC=9D=B8=EC=A6=9D=20=ED=83=AD=EB=B3=84=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/(pages)/(main)/layout.tsx | 12 ++-- src/app/(pages)/logout/page.tsx | 6 +- src/app/api/bookmark/[[...slug]]/route.ts | 6 +- src/app/api/derived/[[...slug]]/route.ts | 6 +- src/app/api/export/[[...slug]]/route.ts | 6 +- src/app/api/external/[urlkey]/login/route.ts | 13 +--- src/app/api/import/[[...slug]]/route.ts | 6 +- src/app/api/log/visit/route.ts | 6 +- src/app/api/login/[[...slug]]/route.ts | 2 +- src/app/api/project/[[...slug]]/route.ts | 8 +-- src/app/api/quota/[[...slug]]/route.ts | 8 +-- .../api/share/[projectType]/[pkey]/route.ts | 6 +- src/components/app-shell/AppMainLayout.tsx | 5 +- src/components/project/ExternalEntry.tsx | 21 +++---- src/hooks/useAuth.ts | 61 ++++++++++++++++--- src/hooks/useSelectedProject.ts | 17 +----- src/lib/auth-change.ts | 13 ++-- src/lib/auth-cookie.ts | 6 +- src/lib/external-auth.ts | 29 +++++++++ src/lib/http-client.ts | 21 ++++++- src/lib/http-server.ts | 14 ++++- src/query/auth.ts | 19 +++--- src/store/storage/storage-keys.ts | 4 ++ src/types/share.ts | 6 ++ 24 files changed, 187 insertions(+), 114 deletions(-) create mode 100644 src/lib/external-auth.ts diff --git a/src/app/(pages)/(main)/layout.tsx b/src/app/(pages)/(main)/layout.tsx index 72ad8cb..137f857 100644 --- a/src/app/(pages)/(main)/layout.tsx +++ b/src/app/(pages)/(main)/layout.tsx @@ -1,11 +1,9 @@ -import { cookies } from "next/headers"; -import { redirect } from "next/navigation"; import { AppMainLayout } from "@/components/app-shell/AppMainLayout"; -import { CookieKeys } from "@/store/cookie/cookie-keys"; -export default async function MainLayout({ children }: Readonly<{ children: React.ReactNode }>) { - const cookieStore = await cookies(); - const accessToken = cookieStore.get(CookieKeys.AuthToken)?.value; - if (!accessToken) redirect("/logout"); +export const dynamic = "force-dynamic"; + +export default function MainLayout({ children }: Readonly<{ children: React.ReactNode }>) { + // External JWTs live in this tab, so authentication is checked after hydration. + // Every BFF/API request still enforces verified server authentication and scope. return {children}; } diff --git a/src/app/(pages)/logout/page.tsx b/src/app/(pages)/logout/page.tsx index f4cf538..d387ac8 100644 --- a/src/app/(pages)/logout/page.tsx +++ b/src/app/(pages)/logout/page.tsx @@ -3,18 +3,20 @@ import { useEffect, useRef } from "react"; import { useRouter } from "next/navigation"; import { useLogoutMutation } from "@/query/auth"; +import { useAuth } from "@/hooks/useAuth"; import { LoadingOverlayAdapter } from "@/components/app-shell/LoadingOverlayAdapter"; export default function LogoutPage() { const router = useRouter(); + const { hydrated } = useAuth(); const logoutMutation = useLogoutMutation(); const started = useRef(false); useEffect(() => { - if (started.current) return; + if (!hydrated || started.current) return; started.current = true; void logoutMutation.mutateAsync().finally(() => router.replace("/login")); - }, [logoutMutation, router]); + }, [hydrated, logoutMutation, router]); return ; } diff --git a/src/app/api/bookmark/[[...slug]]/route.ts b/src/app/api/bookmark/[[...slug]]/route.ts index d6ba98b..386efad 100644 --- a/src/app/api/bookmark/[[...slug]]/route.ts +++ b/src/app/api/bookmark/[[...slug]]/route.ts @@ -1,7 +1,6 @@ import { NextRequest, NextResponse } from "next/server"; -import { cookies } from "next/headers"; import { errorToResponse } from "@kri/common/http"; -import { createServerApi } from "@/lib/http-server"; +import { createServerApi, getServerAccessToken } from "@/lib/http-server"; import { bookmarkUpstreamPath, isBookmarkCreatePath, @@ -9,7 +8,6 @@ import { isBookmarkListPath, } from "@/lib/project-proxy-policy"; import { isBookmarkPage, readBookmarkSaveRequest } from "@/types/bookmark"; -import { CookieKeys } from "@/store/cookie/cookie-keys"; import type { RouteContext } from "@/types/common"; const notFound = () => @@ -19,7 +17,7 @@ const unauthorized = () => const badRequest = () => NextResponse.json({ message: "북마크 저장 내용을 확인해 주세요." }, { status: 400 }); const noStore = { headers: { "Cache-Control": "no-store" } }; -const loggedIn = async () => !!(await cookies()).get(CookieKeys.AuthToken)?.value; +const loggedIn = async () => !!(await getServerAccessToken()); export async function GET(request: NextRequest, context: RouteContext) { const { slug = [] } = await context.params; diff --git a/src/app/api/derived/[[...slug]]/route.ts b/src/app/api/derived/[[...slug]]/route.ts index 8052347..52b8943 100644 --- a/src/app/api/derived/[[...slug]]/route.ts +++ b/src/app/api/derived/[[...slug]]/route.ts @@ -1,7 +1,6 @@ import { NextRequest, NextResponse } from "next/server"; -import { cookies } from "next/headers"; import { errorToResponse } from "@kri/common/http"; -import { createServerApi } from "@/lib/http-server"; +import { createServerApi, getServerAccessToken } from "@/lib/http-server"; import { derivedUpstreamPath, isDerivedCreatePath, @@ -9,7 +8,6 @@ import { isDerivedListPath, } from "@/lib/project-proxy-policy"; import { readDerivedSaveRequest } from "@/types/derived"; -import { CookieKeys } from "@/store/cookie/cookie-keys"; import type { RouteContext } from "@/types/common"; const notFound = () => @@ -17,7 +15,7 @@ const notFound = () => const unauthorized = () => NextResponse.json({ message: "로그인이 필요합니다." }, { status: 401 }); const noStore = { headers: { "Cache-Control": "no-store" } }; -const loggedIn = async () => !!(await cookies()).get(CookieKeys.AuthToken)?.value; +const loggedIn = async () => !!(await getServerAccessToken()); export async function GET(_request: NextRequest, context: RouteContext) { const { slug = [] } = await context.params; diff --git a/src/app/api/export/[[...slug]]/route.ts b/src/app/api/export/[[...slug]]/route.ts index ff09496..ab0f0d9 100644 --- a/src/app/api/export/[[...slug]]/route.ts +++ b/src/app/api/export/[[...slug]]/route.ts @@ -1,10 +1,8 @@ import { NextRequest, NextResponse } from "next/server"; -import { cookies } from "next/headers"; import { errorToResponse } from "@kri/common/http"; -import { createServerApi } from "@/lib/http-server"; +import { createServerApi, getServerAccessToken } from "@/lib/http-server"; import { exportTarget } from "@/lib/project-proxy-policy"; import { readExcelRequest, readRawDataRequest } from "@/types/export"; -import { CookieKeys } from "@/store/cookie/cookie-keys"; import type { RouteContext } from "@/types/common"; // Workbooks for large projects take a while to build on the server. @@ -20,7 +18,7 @@ async function download(request: NextRequest, context: RouteContext, method: "GE const target = exportTarget(method, slug); if (!target) return NextResponse.json({ message: "지원하지 않는 경로입니다." }, { status: 404 }); - if (!(await cookies()).get(CookieKeys.AuthToken)?.value) + if (!(await getServerAccessToken())) return NextResponse.json({ message: "로그인이 필요합니다." }, { status: 401 }); let body: unknown; if (target.body !== "none") { diff --git a/src/app/api/external/[urlkey]/login/route.ts b/src/app/api/external/[urlkey]/login/route.ts index 0305beb..856321f 100644 --- a/src/app/api/external/[urlkey]/login/route.ts +++ b/src/app/api/external/[urlkey]/login/route.ts @@ -1,21 +1,17 @@ import { NextRequest, NextResponse } from "next/server"; import { errorToResponse } from "@kri/common/http"; -import { AUTH_COOKIE_MAX_AGE } from "@/const/common.const"; -import { serverEnv } from "@/lib/env.server"; import { createServerApi } from "@/lib/http-server"; -import { CookieKeys } from "@/store/cookie/cookie-keys"; import { isRecord } from "@/types/kart"; import { isExternalSession, isUrlKey } from "@/types/share"; export async function POST(_request: NextRequest, context: { params: Promise<{ urlkey: string }> }) { const { urlkey } = await context.params; let response: NextResponse; - let token = ""; try { if (!isUrlKey(urlkey)) { response = NextResponse.json({ message: "공유 링크를 찾을 수 없습니다." }, { status: 404 }); } else { - // Link login replaces the previous identity, including an expired credential cookie. + // A link login issues a tab-scoped credential without touching normal-login cookies. const api = await createServerApi(false); const result = await api.post(`/external/${urlkey}/login`, null, { cache: "no-store" }); const accessToken = isRecord(result) ? result.accessToken : null; @@ -23,8 +19,7 @@ export async function POST(_request: NextRequest, context: { params: Promise<{ u typeof accessToken !== "string" || !accessToken) { response = NextResponse.json({ message: "공유 링크 로그인 응답을 확인해 주세요." }, { status: 502 }); } else { - token = accessToken; - response = NextResponse.json({ user: result.user, link: result.link }); + response = NextResponse.json({ user: result.user, link: result.link, accessToken }); } } } catch (error) { @@ -32,9 +27,5 @@ export async function POST(_request: NextRequest, context: { params: Promise<{ u response = new NextResponse(failure.body, { status: failure.status, headers: failure.headers }); } response.headers.set("Cache-Control", "no-store"); - response.cookies.set(CookieKeys.AuthToken, token, { - httpOnly: true, secure: ["prod", "production"].includes(serverEnv.ENV), - sameSite: "lax", path: "/", maxAge: token ? AUTH_COOKIE_MAX_AGE : 0, - }); return response; } diff --git a/src/app/api/import/[[...slug]]/route.ts b/src/app/api/import/[[...slug]]/route.ts index d6ff834..8ede927 100644 --- a/src/app/api/import/[[...slug]]/route.ts +++ b/src/app/api/import/[[...slug]]/route.ts @@ -1,10 +1,8 @@ import { NextRequest, NextResponse } from "next/server"; -import { cookies } from "next/headers"; import { errorToResponse } from "@kri/common/http"; -import { createServerApi } from "@/lib/http-server"; +import { createServerApi, getServerAccessToken } from "@/lib/http-server"; import { isImportPath } from "@/lib/project-proxy-policy"; import { readImportResult } from "@/types/export"; -import { CookieKeys } from "@/store/cookie/cookie-keys"; import type { RouteContext } from "@/types/common"; // Imports replace project data on the server and may run for minutes. @@ -15,7 +13,7 @@ export async function POST(request: NextRequest, context: RouteContext) { const { slug = [] } = await context.params; if (!isImportPath(slug)) return NextResponse.json({ message: "지원하지 않는 경로입니다." }, { status: 404 }); - if (!(await cookies()).get(CookieKeys.AuthToken)?.value) + if (!(await getServerAccessToken())) return NextResponse.json({ message: "로그인이 필요합니다." }, { status: 401 }); let file: File; try { diff --git a/src/app/api/log/visit/route.ts b/src/app/api/log/visit/route.ts index 5ea299c..8f6bfe2 100644 --- a/src/app/api/log/visit/route.ts +++ b/src/app/api/log/visit/route.ts @@ -1,12 +1,10 @@ import { NextRequest, NextResponse } from "next/server"; -import { cookies } from "next/headers"; import { errorToResponse } from "@kri/common/http"; -import { createServerApi } from "@/lib/http-server"; -import { CookieKeys } from "@/store/cookie/cookie-keys"; +import { createServerApi, getServerAccessToken } from "@/lib/http-server"; import { isProjectRef, isRecord } from "@/types/kart"; export async function POST(request: NextRequest) { - if (!(await cookies()).get(CookieKeys.AuthToken)?.value) + if (!(await getServerAccessToken())) return NextResponse.json( { message: "로그인이 필요합니다." }, { status: 401 }, diff --git a/src/app/api/login/[[...slug]]/route.ts b/src/app/api/login/[[...slug]]/route.ts index c57be36..99f9fe8 100644 --- a/src/app/api/login/[[...slug]]/route.ts +++ b/src/app/api/login/[[...slug]]/route.ts @@ -26,7 +26,7 @@ export async function POST(request: NextRequest, context: RouteContext) { { status: 400 }, ); } - const serverApi = await createServerApi(); + const serverApi = await createServerApi(false); const result = await serverApi.post( "/auth/login", { userId: body.userId.trim(), userPw: body.userPw }, diff --git a/src/app/api/project/[[...slug]]/route.ts b/src/app/api/project/[[...slug]]/route.ts index bf1e0d4..9856e83 100644 --- a/src/app/api/project/[[...slug]]/route.ts +++ b/src/app/api/project/[[...slug]]/route.ts @@ -1,14 +1,12 @@ import { NextRequest, NextResponse } from "next/server"; -import { cookies } from "next/headers"; import { errorToResponse } from "@kri/common/http"; -import { createServerApi } from "@/lib/http-server"; +import { createServerApi, getServerAccessToken } from "@/lib/http-server"; import { readReportBatch } from "@/lib/report-contract"; import { isProjectReadPath, projectReadQuery, isReportStreamPath, } from "@/lib/project-proxy-policy"; -import { CookieKeys } from "@/store/cookie/cookie-keys"; import type { RouteContext } from "@/types/common"; export async function GET(request: NextRequest, context: RouteContext) { @@ -18,7 +16,7 @@ export async function GET(request: NextRequest, context: RouteContext) { { message: "지원하지 않는 경로입니다." }, { status: 404 }, ); - if (!(await cookies()).get(CookieKeys.AuthToken)?.value) + if (!(await getServerAccessToken())) return NextResponse.json( { message: "로그인이 필요합니다." }, { status: 401 }, @@ -49,7 +47,7 @@ export async function POST(request: NextRequest, context: RouteContext) { { message: "지원하지 않는 경로입니다." }, { status: 404 }, ); - if (!(await cookies()).get(CookieKeys.AuthToken)?.value) + if (!(await getServerAccessToken())) return NextResponse.json( { message: "로그인이 필요합니다." }, { status: 401 }, diff --git a/src/app/api/quota/[[...slug]]/route.ts b/src/app/api/quota/[[...slug]]/route.ts index 39e392c..84a3c09 100644 --- a/src/app/api/quota/[[...slug]]/route.ts +++ b/src/app/api/quota/[[...slug]]/route.ts @@ -1,10 +1,8 @@ import { NextRequest, NextResponse } from "next/server"; -import { cookies } from "next/headers"; import { errorToResponse } from "@kri/common/http"; -import { createServerApi } from "@/lib/http-server"; +import { createServerApi, getServerAccessToken } from "@/lib/http-server"; import { isQuotaListPath, isQuotaResultPath } from "@/lib/project-proxy-policy"; import { readQuotaRequest } from "@/types/quota"; -import { CookieKeys } from "@/store/cookie/cookie-keys"; import type { RouteContext } from "@/types/common"; const notFound = () => @@ -15,7 +13,7 @@ const unauthorized = () => export async function GET(_request: NextRequest, context: RouteContext) { const { slug = [] } = await context.params; if (!isQuotaListPath(slug)) return notFound(); - if (!(await cookies()).get(CookieKeys.AuthToken)?.value) return unauthorized(); + if (!(await getServerAccessToken())) return unauthorized(); try { const serverApi = await createServerApi(); const result = await serverApi.get( @@ -31,7 +29,7 @@ export async function GET(_request: NextRequest, context: RouteContext) { export async function POST(request: NextRequest, context: RouteContext) { const { slug = [] } = await context.params; if (!isQuotaResultPath(slug)) return notFound(); - if (!(await cookies()).get(CookieKeys.AuthToken)?.value) return unauthorized(); + if (!(await getServerAccessToken())) return unauthorized(); let body; try { body = readQuotaRequest(await request.json()); diff --git a/src/app/api/share/[projectType]/[pkey]/route.ts b/src/app/api/share/[projectType]/[pkey]/route.ts index a3cb4a2..c3a87b9 100644 --- a/src/app/api/share/[projectType]/[pkey]/route.ts +++ b/src/app/api/share/[projectType]/[pkey]/route.ts @@ -1,8 +1,6 @@ -import { cookies } from "next/headers"; import { NextRequest, NextResponse } from "next/server"; import { errorToResponse } from "@kri/common/http"; -import { createServerApi } from "@/lib/http-server"; -import { CookieKeys } from "@/store/cookie/cookie-keys"; +import { createServerApi, getServerAccessToken } from "@/lib/http-server"; import { isProjectRef, isRecord } from "@/types/kart"; import { isShareLink } from "@/types/share"; @@ -12,7 +10,7 @@ export async function POST(request: NextRequest, context: { const params = await context.params; const project = { projectType: params.projectType === "0" ? 0 : params.projectType === "1" ? 1 : null, pkey: params.pkey }; if (!isProjectRef(project)) return NextResponse.json({ message: "프로젝트를 확인해 주세요." }, { status: 400 }); - if (!(await cookies()).get(CookieKeys.AuthToken)?.value) + if (!(await getServerAccessToken())) return NextResponse.json({ message: "로그인이 필요합니다." }, { status: 401 }); let body: unknown; try { body = await request.json(); } catch { body = null; } diff --git a/src/components/app-shell/AppMainLayout.tsx b/src/components/app-shell/AppMainLayout.tsx index b5e7769..017fb0f 100644 --- a/src/components/app-shell/AppMainLayout.tsx +++ b/src/components/app-shell/AppMainLayout.tsx @@ -20,13 +20,14 @@ export function AppMainLayout({ children }: { children: ReactNode }) { const externalAllowed = !external || (!!auth.external && externalPageAllowed(auth.external, pathname)); useEffect(() => { if (hydrated && !auth.user) router.replace("/logout"); + else if (hydrated && external && !auth.accessToken) router.replace("/logout"); // Legacy Main sends shared-link users (isAdmin > 8) to Logout, ending the External session. else if (hydrated && external && pathname === "/") router.replace("/logout"); else if (hydrated && !externalAllowed) router.replace((auth.external ? reportUrl(auth.external.realUrl) : "/logout") as Route); - }, [hydrated, auth.user, auth.external, external, externalAllowed, pathname, router]); + }, [hydrated, auth.user, auth.external, auth.accessToken, external, externalAllowed, pathname, router]); const hasSidebar = sideMenus.length > 0; - if (!hydrated || !auth.user || !externalAllowed) + if (!hydrated || !auth.user || !externalAllowed || (external && !auth.accessToken)) return (

| null>(null); + const pending = useRef | null>(null); const [error, setError] = useState(""); useEffect(() => { if (!hydrated) return; let active = true; const enter = async () => { - logout(); + setAuth({ mode: "external", user: null }); await resetSession(); - const result = await nextApi.post(`/external/${encodeURIComponent(urlKey)}/login`, null, { + const result = await authApi.post(`/external/${encodeURIComponent(urlKey)}/login`, null, { skipUnauthorizedHandler: true, skipForbiddenHandler: true, skipResponseErrorHandler: true, }); - if (!isExternalSession(result)) throw new Error("공유 링크 로그인 응답을 확인해 주세요."); + if (!isExternalLoginResponse(result)) throw new Error("공유 링크 로그인 응답을 확인해 주세요."); return result; }; // Reuse the request during StrictMode effect replay; each entry records one landing. @@ -37,17 +36,15 @@ export function ExternalEntry({ urlKey }: { urlKey: string }) { void pending.current.then((result) => { if (!active) return; setProject({ userId: result.user.userId, project: { projectType: result.link.projectType, pkey: result.link.pkey } }); - setAuth({ user: result.user, external: result.link }); - notifyAuthChange(result.link.realUrl); + setAuth({ mode: "external", user: result.user, external: result.link, accessToken: result.accessToken }); router.replace(reportUrl(result.link.realUrl) as Route); }).catch((reason: unknown) => { if (active) { - notifyAuthChange("/login"); setError(apiError(reason, { fallbackMessage: "공유 링크를 확인해 주세요." }).message); } }); return () => { active = false; }; - }, [hydrated, logout, setAuth, setProject, resetSession, router, urlKey]); + }, [hydrated, setAuth, setProject, resetSession, router, urlKey]); if (error) return

{error}

; return ; } diff --git a/src/hooks/useAuth.ts b/src/hooks/useAuth.ts index 18f8096..28e53ea 100644 --- a/src/hooks/useAuth.ts +++ b/src/hooks/useAuth.ts @@ -1,7 +1,8 @@ "use client"; import { useCallback } from "react"; -import { useAtom, useAtomValue } from "jotai"; +import { atom, useAtom, useAtomValue } from "jotai"; +import type { SetStateAction } from "react"; import type { LoginUser } from "@kri/common"; import { isRecord, isLoginUser } from "@/types/kart"; import type { AuthState as CommonAuthState } from "@kri/common/hooks"; @@ -10,25 +11,27 @@ import { getLocalStorage, removeLocalStorage, setLocalStorage, + getSessionStorage, + setSessionStorage, + removeSessionStorage, } from "@/store/storage/secure-storage"; import { StorageKeys } from "@/store/storage/storage-keys"; -import { isExternalSession, isExternalUser, type ShareLink } from "@/types/share"; +import { isExternalUser, type ShareLink } from "@/types/share"; +import { isExternalAuth, type ExternalAuth } from "@/lib/external-auth"; -export type AuthState = CommonAuthState & { external?: ShareLink }; +export type AuthState = CommonAuthState & { external?: ShareLink; accessToken?: string; mode?: "external" }; const initialAuthState: AuthState = { user: null }; const isPersistedAuthState = (value: unknown): value is AuthState => - isRecord(value) && isLoginUser(value.user) && - (isExternalUser(value.user) - ? isExternalSession({ user: value.user, link: value.external }) - : value.external === undefined); + isRecord(value) && isLoginUser(value.user) && !isExternalUser(value.user) && + value.accessToken === undefined && value.external === undefined; /* * atom은 서버·클라이언트 최초 렌더 모두 initialAuthState로 시작한다. * 저장소 값은 onMount(마운트 이후 시점)에만 반영되므로 * 서버 HTML과 클라이언트 최초 렌더가 항상 일치해 하이드레이션 오류가 발생하지 않는다. */ -export const authStateAtom = createPersistentAtom( +const normalAuthStateAtom = createPersistentAtom( StorageKeys.AuthState, initialAuthState, { @@ -43,6 +46,48 @@ export const authStateAtom = createPersistentAtom( }, ); +const sessionStorage = { get: getSessionStorage, set: setSessionStorage, remove: removeSessionStorage }; +const authModeAtom = createPersistentAtom<"normal" | "external">(StorageKeys.AuthMode, "normal", { + storage: sessionStorage, + validate: (value): value is "normal" | "external" => value === "normal" || value === "external", + shouldRemove: (value) => value === "normal", +}); +const externalAuthStateAtom = createPersistentAtom(StorageKeys.ExternalAuth, null, { + storage: sessionStorage, + validate: (value): value is ExternalAuth | null => value === null || isExternalAuth(value), +}); +const emptyExternalAuth: ExternalAuth = { mode: "external", user: null }; + +export const authStateAtom = Object.assign(atom( + (get): AuthState => { + const normal = get(normalAuthStateAtom); + const mode = get(authModeAtom); + const external = get(externalAuthStateAtom); + if (mode === "external") return external ?? emptyExternalAuth; + return normal; + }, + (get, set, action: SetStateAction) => { + const previous = get(authStateAtom); + const next = typeof action === "function" ? action(previous) : action; + if (next.mode === "external" || isExternalUser(next.user)) { + set(authModeAtom, "external"); + set(externalAuthStateAtom, { ...next, mode: "external" }); + return; + } + if (!next.user && previous.mode === "external") { + set(authModeAtom, "external"); + set(externalAuthStateAtom, null); + return; + } + set(authModeAtom, "normal"); + set(externalAuthStateAtom, null); + set(normalAuthStateAtom, { user: next.user }); + }, +), { + hydratedAtom: atom((get) => get(normalAuthStateAtom.hydratedAtom) && + get(authModeAtom.hydratedAtom) && get(externalAuthStateAtom.hydratedAtom)), +}); + export function useAuth() { const [auth, setAuth] = useAtom(authStateAtom); const hydrated = useAtomValue(authStateAtom.hydratedAtom); diff --git a/src/hooks/useSelectedProject.ts b/src/hooks/useSelectedProject.ts index 53c8d84..504f235 100644 --- a/src/hooks/useSelectedProject.ts +++ b/src/hooks/useSelectedProject.ts @@ -6,7 +6,6 @@ import { createPersistentAtom } from "@kri/common/jotai"; import { useAuth } from "@/hooks/useAuth"; import { isExternalUser } from "@/types/share"; import { - getLocalStorage, getSessionStorage, removeSessionStorage, setSessionStorage, @@ -24,25 +23,13 @@ const isSelectedProject = (value: unknown): value is SelectedProject => value.userId !== "" && isProjectRef(value.project)); -/** Each tab owns its selection; copy a legacy selection only on its first hydration. */ +/** Each tab owns its selection. */ export const selectedProjectAtom = createPersistentAtom( StorageKeys.SelectedProject, null, { storage: { - get: (key: string): T | null => { - const stored = getSessionStorage(key); - if (stored !== null) return stored; - const migrationKey = key + ":session-migrated"; - if (getSessionStorage(migrationKey)) return null; - setSessionStorage(migrationKey, true); - const legacy = getLocalStorage(key); - if (isSelectedProject(legacy) && legacy !== null) { - setSessionStorage(key, legacy); - return legacy; - } - return null; - }, + get: getSessionStorage, set: setSessionStorage, remove: removeSessionStorage, }, diff --git a/src/lib/auth-change.ts b/src/lib/auth-change.ts index d240bff..1d555fd 100644 --- a/src/lib/auth-change.ts +++ b/src/lib/auth-change.ts @@ -1,8 +1,8 @@ -import { reportUrl } from "@/types/share"; +import { readExternalAuth } from "@/lib/external-auth"; // Set false to disable only cross-tab notifications and their listener. const AUTH_CHANGE_SYNC_ENABLED = true; -const CHANNEL = "kart:auth-change"; +const CHANNEL = "kart:internal-auth-change"; let channel: BroadcastChannel | undefined; function authChannel() { @@ -15,7 +15,7 @@ function authChannel() { } } -export function notifyAuthChange(path: string) { +export function notifyAuthChange(path: "/" | "/login") { authChannel()?.postMessage(path); } @@ -23,10 +23,11 @@ export function subscribeToAuthChanges() { const listener = authChannel(); if (!listener) return; listener.onmessage = (event: MessageEvent) => { - const path = event.data === "/" || event.data === "/login" - ? event.data : reportUrl(event.data); + // A normal-login change must not navigate an independently authenticated link tab. + if (readExternalAuth()) return; + if (event.data !== "/" && event.data !== "/login") return; // A full navigation discards this tab's cache/state without clearing the new cookie. - if (path) window.location.replace(path); + window.location.replace(event.data); }; return () => { listener.close(); diff --git a/src/lib/auth-cookie.ts b/src/lib/auth-cookie.ts index aa0954f..64a8b96 100644 --- a/src/lib/auth-cookie.ts +++ b/src/lib/auth-cookie.ts @@ -7,9 +7,7 @@ import { CookieKeys } from "@/store/cookie/cookie-keys"; /** Issue/renew the normal-login cookie, or expire it when the token is empty. */ export function setAuthCookie(response: NextResponse, token: string): void { const production = serverEnv.ENV === "prod"; - const domain = production ? serverEnv.AUTH_COOKIE_DOMAIN : undefined; - if (production && !domain) - throw new Error("AUTH_COOKIE_DOMAIN must be configured when ENV is prod."); + const domain = serverEnv.AUTH_COOKIE_DOMAIN; const options = { httpOnly: true, @@ -30,6 +28,6 @@ export function setAuthCookie(response: NextResponse, token: string): void { response.headers.append("Set-Cookie", header); }; - if (production) append("", undefined, 0); + if (domain) append("", undefined, 0); append(token, domain, token ? AUTH_COOKIE_MAX_AGE : 0); } diff --git a/src/lib/external-auth.ts b/src/lib/external-auth.ts new file mode 100644 index 0000000..4f942ba --- /dev/null +++ b/src/lib/external-auth.ts @@ -0,0 +1,29 @@ +"use client"; + +import type { LoginUser } from "@kri/common"; +import { getSessionStorage } from "@/store/storage/secure-storage"; +import { StorageKeys } from "@/store/storage/storage-keys"; +import { isRecord } from "@/types/kart"; +import { isExternalSession, type ShareLink } from "@/types/share"; + +export type ExternalAuth = { + mode: "external"; + user: LoginUser | null; + external?: ShareLink; + accessToken?: string; +}; + +export function isExternalAuth(value: unknown): value is ExternalAuth { + if (!isRecord(value) || value.mode !== "external") return false; + if (value.user === null) return value.external === undefined && value.accessToken === undefined; + return isExternalSession({ user: value.user, link: value.external }) && + (value.accessToken === undefined || typeof value.accessToken === "string"); +} + +/** The mode survives missing/invalid token data so requests never fall back to the normal cookie. */ +export function readExternalAuth(): ExternalAuth | null { + if (getSessionStorage(StorageKeys.AuthMode) !== "external") return null; + const value = getSessionStorage(StorageKeys.ExternalAuth); + if (isExternalAuth(value)) return value; + return { mode: "external", user: null }; +} diff --git a/src/lib/http-client.ts b/src/lib/http-client.ts index 0b16b81..2fba008 100644 --- a/src/lib/http-client.ts +++ b/src/lib/http-client.ts @@ -1,6 +1,7 @@ -import { apiError, createHttpClient, redirectToLogout } from "@kri/common/http"; +import { apiError, createHttpClient, HttpError, redirectToLogout } from "@kri/common/http"; import { clientEnv } from "@/lib/env.client"; import { announceProjectAccess, projectFromRequest } from "@/lib/project-access"; +import { readExternalAuth } from "@/lib/external-auth"; const resolveBaseUrl = () => typeof window === "undefined" @@ -8,9 +9,18 @@ const resolveBaseUrl = () => : new URL(clientEnv.API_BASE, window.location.origin).toString(); export const nextApi = createHttpClient(resolveBaseUrl(), { + getToken: () => { + const external = readExternalAuth(); + if (!external) return null; + if (!external.accessToken) { + redirectToLogout(); + throw new HttpError(401, { message: "공유 링크 인증이 필요합니다." }, ""); + } + return external.accessToken; + }, onForbidden: (error) => { const info = apiError(error); - if (info.code === "EXTERNAL_SCOPE_DENIED" || info.code === "PROJECT_IDENTITY_REQUIRED") { + if (readExternalAuth() || info.code === "EXTERNAL_SCOPE_DENIED" || info.code === "PROJECT_IDENTITY_REQUIRED") { redirectToLogout(); return; } @@ -20,3 +30,10 @@ export const nextApi = createHttpClient(resolveBaseUrl(), { }, onResponseError: false, }); + +// Login/logout BFF operations must also work before an External JWT is available. +export const authApi = createHttpClient(resolveBaseUrl(), { + onUnauthorized: false, + onForbidden: false, + onResponseError: false, +}); diff --git a/src/lib/http-server.ts b/src/lib/http-server.ts index cf0fa11..1d5aa8d 100644 --- a/src/lib/http-server.ts +++ b/src/lib/http-server.ts @@ -1,11 +1,19 @@ -import { cookies } from "next/headers"; +import { cookies, headers } from "next/headers"; import { createHttpClient } from "@kri/common/http"; import { serverEnv } from "@/lib/env.server"; import { CookieKeys } from "@/store/cookie/cookie-keys"; +export async function getServerAccessToken(): Promise { + const authorization = (await headers()).get("authorization"); + // Explicit credentials take precedence even when malformed; never use the normal + // cookie as a fallback for an External request. The backend verifies the JWT. + if (authorization !== null) return /^Bearer ([^\s]+)$/i.exec(authorization)?.[1] ?? null; + return (await cookies()).get(CookieKeys.AuthToken)?.value ?? null; +} + export async function createServerApi(authenticated = true) { - const cookieStore = await cookies(); - const accessToken = authenticated ? cookieStore.get(CookieKeys.AuthToken)?.value ?? null : null; + let accessToken: string | null = null; + if (authenticated) accessToken = await getServerAccessToken(); return createHttpClient(serverEnv.API_SERVER, { getToken: () => accessToken, defaultHeaders: { "content-type": "application/json" }, diff --git a/src/query/auth.ts b/src/query/auth.ts index 2c51db5..24ffadd 100644 --- a/src/query/auth.ts +++ b/src/query/auth.ts @@ -5,15 +5,16 @@ import { useMutation } from "@tanstack/react-query"; import { useAuth } from "@/hooks/useAuth"; import { useResetSession } from "@/hooks/useResetSession"; import { notifyAuthChange } from "@/lib/auth-change"; -import { nextApi } from "@/lib/http-client"; +import { authApi } from "@/lib/http-client"; import { isLoginUser } from "@/types/kart"; +import { readExternalAuth } from "@/lib/external-auth"; export function useLoginMutation() { const { setFromLoginResponse } = useAuth(); const resetSession = useResetSession(); return useMutation({ mutationFn: async (request: LoginRequest) => { - const user = await nextApi.post("/login", request, { + const user = await authApi.post("/login", request, { skipUnauthorizedHandler: true, skipForbiddenHandler: true, skipResponseErrorHandler: true, @@ -32,17 +33,21 @@ export function useLoginMutation() { export function useLogoutMutation() { const { logout } = useAuth(); const resetSession = useResetSession(); + const externalSession = () => !!readExternalAuth(); return useMutation({ - mutationFn: () => - nextApi.post("/logout", null, { + onMutate: () => ({ external: externalSession() }), + mutationFn: async () => { + if (externalSession()) return; + await authApi.post("/logout", null, { skipUnauthorizedHandler: true, skipForbiddenHandler: true, skipResponseErrorHandler: true, - }), - onSettled: async () => { + }); + }, + onSettled: async (_data, _error, _variables, context) => { await resetSession(); logout(); - notifyAuthChange("/login"); + if (!context?.external) notifyAuthChange("/login"); }, }); } diff --git a/src/store/storage/storage-keys.ts b/src/store/storage/storage-keys.ts index 985598f..20be54e 100644 --- a/src/store/storage/storage-keys.ts +++ b/src/store/storage/storage-keys.ts @@ -1,10 +1,14 @@ export const StorageKeys = { AuthState: "kri:authState", + AuthMode: "kart:authMode", + ExternalAuth: "kart:externalAuth", SelectedProject: "kart:selectedProject", } as const; export type StorageKey = (typeof StorageKeys)[keyof typeof StorageKeys]; export const StorageType: Record = { [StorageKeys.AuthState]: "local", + [StorageKeys.AuthMode]: "session", + [StorageKeys.ExternalAuth]: "session", [StorageKeys.SelectedProject]: "session", }; diff --git a/src/types/share.ts b/src/types/share.ts index 8554e57..d035f3d 100644 --- a/src/types/share.ts +++ b/src/types/share.ts @@ -15,6 +15,12 @@ export type ShareLink = ProjectRef & { pageOnly: boolean; }; export type ExternalSession = { user: LoginUser; link: ShareLink }; +export type ExternalLoginResponse = ExternalSession & { accessToken: string }; + +export function isExternalLoginResponse(value: unknown): value is ExternalLoginResponse { + return isRecord(value) && typeof value.accessToken === "string" && + value.accessToken.length > 0 && isExternalSession(value); +} export function isExternalUser(user: LoginUser | null | undefined): boolean { return !!user && (user.userRole === EXTERNAL_URL_COPY_ROLE ||