develop #5

Merged
gitadmin merged 4 commits from develop into master 2026-11-02 18:37:03 +09:00
18 changed files with 336 additions and 53 deletions
Showing only changes of commit 69939f8d2b - Show all commits

View File

@@ -1,3 +1,4 @@
NEXT_PUBLIC_ENV=development
ENV=development
API_SERVER=http://127.0.0.1:4015/api/v1
AUTH_COOKIE_DOMAIN=kric.com

View File

@@ -1,3 +1,4 @@
NEXT_PUBLIC_ENV=production
ENV=production
ENV=prod
API_SERVER=http://127.0.0.1:4015/api/v1
AUTH_COOKIE_DOMAIN=kric.com

View File

@@ -1,9 +1,7 @@
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 { setAuthCookie } from "@/lib/auth-cookie";
import { createServerApi } from "@/lib/http-server";
import { CookieKeys } from "@/store/cookie/cookie-keys";
import { isLoginUser, isRecord } from "@/types/kart";
import type { RouteContext } from "@/types/common";
@@ -48,13 +46,7 @@ export async function POST(request: NextRequest, context: RouteContext) {
const response = NextResponse.json(result.user, {
headers: { "Cache-Control": "no-store" },
});
response.cookies.set(CookieKeys.AuthToken, result.accessToken, {
httpOnly: true,
secure: ["prod", "production"].includes(serverEnv.ENV),
sameSite: "lax",
path: "/",
maxAge: AUTH_COOKIE_MAX_AGE,
});
setAuthCookie(response, result.accessToken);
return response;
} catch (error: unknown) {
if (error instanceof SyntaxError)

View File

@@ -1,6 +1,5 @@
import { NextResponse } from "next/server";
import { serverEnv } from "@/lib/env.server";
import { CookieKeys } from "@/store/cookie/cookie-keys";
import { setAuthCookie } from "@/lib/auth-cookie";
/** Stateless backend authentication has no logout API; discard the frontend session cookie. */
export async function POST() {
@@ -8,12 +7,6 @@ export async function POST() {
{ ok: true },
{ headers: { "Cache-Control": "no-store" } },
);
response.cookies.set(CookieKeys.AuthToken, "", {
httpOnly: true,
secure: ["prod", "production"].includes(serverEnv.ENV),
sameSite: "lax",
path: "/",
maxAge: 0,
});
setAuthCookie(response, "");
return response;
}

View File

@@ -5,6 +5,7 @@ import { Fragment, Suspense, useEffect, useState, type ReactNode } from "react";
import { usePathname, useRouter } from "next/navigation";
import { KriMainLayout } from "@/components/layout/KriMainLayout";
import { AppHeader } from "./AppHeader";
import { ProjectEntry } from "@/components/project/ProjectEntry";
import { AppSidebar } from "./AppSidebar";
import { sideMenus } from "@/config/menu.data";
import { useAuth } from "@/hooks/useAuth";
@@ -56,7 +57,11 @@ export function AppMainLayout({ children }: { children: ReactNode }) {
}
mainClassName="bg-kart-bg px-[1.0416vw] pt-2.5 pb-6"
>
<Fragment key={auth.user.userId + ":" + auth.user.userRole}>{children}</Fragment>
<Fragment key={auth.user.userId + ":" + auth.user.userRole}>
<Suspense fallback={<p role="status" className="p-8 text-center text-sm">로그인 정보를 확인하는 중입니다.</p>}>
<ProjectEntry>{children}</ProjectEntry>
</Suspense>
</Fragment>
</KriMainLayout>
);
}

View File

@@ -0,0 +1,110 @@
"use client";
import { useEffect, useState, type ReactNode } from "react";
import { usePathname, useRouter, useSearchParams } from "next/navigation";
import type { Route } from "next";
import { useStore } from "jotai";
import { useQueryClient } from "@tanstack/react-query";
import { authStateAtom, useAuth } from "@/hooks/useAuth";
import { useSelectedProject } from "@/hooks/useSelectedProject";
import { projectSelectionAtom } from "@/hooks/useProjectNavigation";
import { checkProjectAccess } from "@/query/project";
import { isProjectPage } from "@/lib/report-navigation";
import {
announceProjectAccess, PROJECT_ACCESS_EVENT, projectAccessMessage, projectFromSearch,
type ProjectAccessEvent,
} from "@/lib/project-access";
import { isExternalUser } from "@/types/share";
import { projectKey } from "@/types/kart";
import { Button } from "@/components/ui/button";
import { QueryState } from "./QueryState";
/** Resolve incoming project parameters before mounting any project data consumers. */
export function ProjectEntry({ children }: { children: ReactNode }) {
const pathname = usePathname();
const search = useSearchParams().toString();
const router = useRouter();
const store = useStore();
const queryClient = useQueryClient();
const { auth } = useAuth();
const { project, select } = useSelectedProject();
const external = isExternalUser(auth.user);
const hasParams = isProjectPage(pathname) &&
(new URLSearchParams(search).has("projectType") || new URLSearchParams(search).has("pkey"));
const signature = pathname + "?" + search;
const [attempt, setAttempt] = useState(0);
const [result, setResult] = useState<{ signature: string; error: Error | null } | null>(null);
const [denied, setDenied] = useState<ProjectAccessEvent | null>(null);
useEffect(() => {
if (!hasParams) return;
let active = true;
const id = store.get(projectSelectionAtom).id + 1;
store.set(projectSelectionAtom, { id, pending: true });
const current = () => active && store.get(projectSelectionAtom).id === id &&
store.get(authStateAtom) === auth;
const enter = async () => {
// External scope always comes from the verified link, never address parameters.
if (!external) {
const candidate = projectFromSearch(new URLSearchParams(search));
if (!candidate) throw new Error("projectType과 pkey를 올바르게 지정해 주세요.");
await checkProjectAccess(candidate);
if (!current()) return;
await queryClient.cancelQueries();
if (!current()) return;
select(candidate);
announceProjectAccess({ project: candidate, allowed: true });
}
if (!current()) return;
const params = new URLSearchParams(search);
params.delete("projectType");
params.delete("pkey");
const clean = pathname + (params.size ? "?" + params : "") + window.location.hash;
setResult({ signature, error: null });
router.replace(clean as Route, { scroll: false });
};
void Promise.resolve().then(enter).catch((error: unknown) => {
if (current()) setResult({ signature, error: new Error(projectAccessMessage(error)) });
}).finally(() => {
if (store.get(projectSelectionAtom).id === id)
store.set(projectSelectionAtom, { id, pending: false });
});
return () => {
active = false;
if (store.get(projectSelectionAtom).id === id)
store.set(projectSelectionAtom, { id: id + 1, pending: false });
};
}, [hasParams, search, pathname, signature, auth, external, select, router, store, queryClient, attempt]);
useEffect(() => {
const onAccess = (event: Event) => {
const detail = (event as CustomEvent<ProjectAccessEvent>).detail;
if (!project || projectKey(detail.project) !== projectKey(project)) return;
setDenied(detail.allowed ? null : detail);
if (!detail.allowed) {
const predicate = (query: { queryKey: readonly unknown[] }) =>
query.queryKey[0] === "kart" && query.queryKey[1] === auth.user?.userId &&
query.queryKey.some((part, index, key) =>
part === project.projectType && key[index + 1] === project.pkey);
void queryClient.cancelQueries({ predicate }).then(() => queryClient.removeQueries({ predicate }));
}
};
window.addEventListener(PROJECT_ACCESS_EVENT, onAccess);
return () => window.removeEventListener(PROJECT_ACCESS_EVENT, onAccess);
}, [project, auth.user?.userId, queryClient]);
if (hasParams) {
const resolved = result?.signature === signature;
if (!resolved || !result.error) return <p role="status" className="p-8 text-center text-sm">프로젝트 접근 권한을 확인하는 중입니다.</p>;
return <QueryState error={result.error} onRetry={() => { setResult(null); setAttempt((value) => value + 1); }} />;
}
if (project && denied && !denied.allowed && projectKey(denied.project) === projectKey(project)) {
return (
<div className="space-y-3">
<QueryState error={new Error(denied.message ?? "프로젝트에 접근할 권한이 없습니다.")} />
<Button variant="outline" onClick={() => router.push("/")}>메인으로 이동</Button>
</div>
);
}
return children;
}

View File

@@ -2,6 +2,9 @@
import Image from "next/image";
import Link from "next/link";
import type { Route } from "next";
import { useProjectNavigation } from "@/hooks/useProjectNavigation";
import { projectPageUrl } from "@/lib/project-access";
import { useEffect } from "react";
import { KriPieChart } from "@/components/chart";
import { useProjectSummaryQuery } from "@/query/project";
@@ -21,7 +24,8 @@ export function ProjectOverview() {
const { auth } = useAuth();
const summary = useProjectSummaryQuery();
const fontReady = useChartFontReady(labels.join("") + "0123456789");
const { hydrated, select, clear } = useSelectedProject();
const { hydrated, clear } = useSelectedProject();
const { navigate, pending } = useProjectNavigation();
useVisitLog("/");
// Legacy Main.js resets the selected project whenever the overview opens.
useEffect(() => {
@@ -47,8 +51,14 @@ export function ProjectOverview() {
className="relative h-[420px] rounded-[15px] border border-kart-line bg-white"
>
<Link
href="/Report/Current"
onClick={() => select(project)}
href={projectPageUrl("/Report/Current", project) as Route}
prefetch={false}
aria-disabled={pending}
onClick={(event) => {
if (event.metaKey || event.ctrlKey || event.shiftKey || event.altKey) return;
event.preventDefault();
if (!pending) void navigate(project, "/Report/Current");
}}
title={project.title ?? project.pkey}
className="-m-px flex h-[55px] items-center justify-between rounded-[15px] border border-kart-line bg-kart-soft p-4"
>

View File

@@ -1,18 +1,26 @@
"use client";
import { useRouter, usePathname } from "next/navigation";
import { usePathname } from "next/navigation";
import { KriSingleSelect } from "@/components/common/KriAutoComplete";
import { useProjectListQuery } from "@/query/project";
import { useProjectNavigation } from "@/hooks/useProjectNavigation";
import { useSelectedProject } from "@/hooks/useSelectedProject";
import { projectKey } from "@/types/kart";
import { projectPagePath } from "@/lib/report-navigation";
import { QueryState } from "./QueryState";
function getProjectPlaceholder(checkingAccess: boolean, loading: boolean, projectCount: number): string {
if (checkingAccess) return "접근 권한을 확인하는 중...";
if (loading) return "목록을 불러오는 중...";
if (projectCount > 0) return "프로젝트 선택";
return "조회 가능한 프로젝트가 없습니다.";
}
/** Legacy ProjectSelect: search dropdown that always reads "프로젝트 선택". */
export function ProjectSelector() {
const router = useRouter();
const pathname = usePathname();
const { project: selected, select } = useSelectedProject();
const { project: selected } = useSelectedProject();
const { navigate, pending } = useProjectNavigation();
const projects = useProjectListQuery();
if (projects.isError)
return (
@@ -35,16 +43,9 @@ export function ProjectSelector() {
);
if (!project) return;
// Same page for the new project (legacy keeps the current menu), progress from home.
select(project);
router.push(projectPagePath(pathname));
void navigate(project, projectPagePath(pathname));
}}
placeholder={
projects.isPending
? "목록을 불러오는 중..."
: projects.data?.length
? "프로젝트 선택"
: "조회 가능한 프로젝트가 없습니다."
}
placeholder={getProjectPlaceholder(pending, projects.isPending, projects.data?.length ?? 0)}
widthClassName="w-full"
className="h-8 min-h-8 rounded-[39px] border-[#d0d0d0] bg-kart-soft px-[22px] py-0 text-sm shadow-none"
spanClassName="text-sm [&_span]:text-kart-text"
@@ -57,7 +58,7 @@ export function ProjectSelector() {
optionTooltipClassName="opacity-65"
preventDeselect
hideOptionCheck
disabled={projects.isPending}
disabled={projects.isPending || pending}
/>
);
}

View File

@@ -0,0 +1,54 @@
"use client";
import { useCallback, useEffect, useRef } from "react";
import { atom, useAtomValue, useStore } from "jotai";
import { useRouter } from "next/navigation";
import type { Route } from "next";
import { toast } from "sonner";
import { useQueryClient } from "@tanstack/react-query";
import { authStateAtom } from "@/hooks/useAuth";
import { selectedProjectAtom } from "@/hooks/useSelectedProject";
import { checkProjectAccess } from "@/query/project";
import { announceProjectAccess, projectAccessMessage } from "@/lib/project-access";
import { isExternalUser } from "@/types/share";
import type { ProjectRef } from "@/types/kart";
// Both the overview and header share one selection lock in this Jotai provider.
export const projectSelectionAtom = atom({ id: 0, pending: false });
export function useProjectNavigation() {
const store = useStore();
const router = useRouter();
const queryClient = useQueryClient();
const selection = useAtomValue(projectSelectionAtom);
const request = useRef<number | null>(null);
useEffect(() => () => {
if (request.current === store.get(projectSelectionAtom).id)
store.set(projectSelectionAtom, (value) => ({ id: value.id + 1, pending: false }));
}, [store]);
const navigate = useCallback(async (project: ProjectRef, path: Route) => {
const auth = store.get(authStateAtom);
if (!auth.user || isExternalUser(auth.user) || store.get(projectSelectionAtom).pending) return;
const id = store.get(projectSelectionAtom).id + 1;
request.current = id;
store.set(projectSelectionAtom, { id, pending: true });
const current = () => store.get(projectSelectionAtom).id === id && store.get(authStateAtom) === auth;
try {
await checkProjectAccess(project);
if (!current()) return;
await queryClient.cancelQueries();
if (!current()) return;
store.set(selectedProjectAtom, { userId: auth.user.userId, project: { projectType: project.projectType, pkey: project.pkey } });
announceProjectAccess({ project, allowed: true });
router.push(path);
} catch (error: unknown) {
if (current()) toast.error(projectAccessMessage(error));
} finally {
if (store.get(projectSelectionAtom).id === id)
store.set(projectSelectionAtom, { id, pending: false });
}
}, [store, router, queryClient]);
return { navigate, pending: selection.pending };
}

View File

@@ -7,8 +7,9 @@ import { useAuth } from "@/hooks/useAuth";
import { isExternalUser } from "@/types/share";
import {
getLocalStorage,
removeLocalStorage,
setLocalStorage,
getSessionStorage,
removeSessionStorage,
setSessionStorage,
} from "@/store/storage/secure-storage";
import { StorageKeys } from "@/store/storage/storage-keys";
import { isProjectRef, isRecord, type ProjectRef } from "@/types/kart";
@@ -23,19 +24,27 @@ const isSelectedProject = (value: unknown): value is SelectedProject =>
value.userId !== "" &&
isProjectRef(value.project));
/**
* Legacy KART kept the selected project in ptokenState (recoil-persist, localStorage) instead of
* the URL. Like authStateAtom, the stored value is applied after mount, so server and first
* client renders agree.
*/
/** Each tab owns its selection; copy a legacy selection only on its first hydration. */
export const selectedProjectAtom = createPersistentAtom<SelectedProject>(
StorageKeys.SelectedProject,
null,
{
storage: {
get: getLocalStorage,
set: setLocalStorage,
remove: removeLocalStorage,
get: <T,>(key: string): T | null => {
const stored = getSessionStorage<T>(key);
if (stored !== null) return stored;
const migrationKey = key + ":session-migrated";
if (getSessionStorage(migrationKey)) return null;
setSessionStorage(migrationKey, true);
const legacy = getLocalStorage<T>(key);
if (isSelectedProject(legacy) && legacy !== null) {
setSessionStorage(key, legacy);
return legacy;
}
return null;
},
set: setSessionStorage,
remove: removeSessionStorage,
},
validate: isSelectedProject,
shouldRemove: (value) => value === null,
@@ -44,8 +53,8 @@ export const selectedProjectAtom = createPersistentAtom<SelectedProject>(
);
/**
* Current project for the signed-in user. Address parameters (old `?projectType=&pkey=` links)
* never select a project; links are shared only through generated Page Copy / URL Copy links.
* Current project for the signed-in user. Incoming address parameters are applied only
* after ProjectEntry verifies normal-user access; External scope comes from the link.
*/
export function useSelectedProject() {
const { auth, hydrated: authHydrated } = useAuth();

35
src/lib/auth-cookie.ts Normal file
View File

@@ -0,0 +1,35 @@
import "server-only";
import { NextResponse } from "next/server";
import { AUTH_COOKIE_MAX_AGE } from "@/const/common.const";
import { serverEnv } from "@/lib/env.server";
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 options = {
httpOnly: true,
secure: production,
sameSite: "lax" as const,
path: "/",
};
// Serialize each cookie separately: ResponseCookies indexes cookies by name,
// so setting the shared and host-only variants on one instance loses a header.
const append = (value: string, cookieDomain: string | undefined, maxAge: number) => {
const cookieResponse = new NextResponse(null);
cookieResponse.cookies.set(CookieKeys.AuthToken, value, {
...options,
...(cookieDomain ? { domain: cookieDomain } : {}),
maxAge,
});
for (const header of cookieResponse.headers.getSetCookie())
response.headers.append("Set-Cookie", header);
};
if (production) append("", undefined, 0);
append(token, domain, token ? AUTH_COOKIE_MAX_AGE : 0);
}

View File

@@ -4,4 +4,8 @@ import { createEnv, env } from "@kri/common/config";
export const serverEnv = createEnv({
ENV: env.required("ENV", process.env.ENV),
API_SERVER: env.required("API_SERVER", process.env.API_SERVER),
AUTH_COOKIE_DOMAIN: env.optional(
"AUTH_COOKIE_DOMAIN",
process.env.AUTH_COOKIE_DOMAIN,
),
});

View File

@@ -1,5 +1,6 @@
import { apiError, createHttpClient, redirectToLogout } from "@kri/common/http";
import { clientEnv } from "@/lib/env.client";
import { announceProjectAccess, projectFromRequest } from "@/lib/project-access";
const resolveBaseUrl = () =>
typeof window === "undefined"
@@ -8,7 +9,14 @@ const resolveBaseUrl = () =>
export const nextApi = createHttpClient(resolveBaseUrl(), {
onForbidden: (error) => {
if (apiError(error).code === "EXTERNAL_SCOPE_DENIED") redirectToLogout();
const info = apiError(error);
if (info.code === "EXTERNAL_SCOPE_DENIED" || info.code === "PROJECT_IDENTITY_REQUIRED") {
redirectToLogout();
return;
}
const project = projectFromRequest(error.url);
if (info.code === "PROJECT_ACCESS_DENIED" && project && !new URL(error.url).pathname.endsWith("/access"))
announceProjectAccess({ project, allowed: false, message: info.message });
},
onResponseError: false,
});

47
src/lib/project-access.ts Normal file
View File

@@ -0,0 +1,47 @@
import { apiError } from "@kri/common/http";
import { isProjectRef, type ProjectRef } from "@/types/kart";
export const PROJECT_ACCESS_EVENT = "kart:project-access";
export type ProjectAccessEvent = {
project: ProjectRef;
allowed: boolean;
message?: string;
};
export function announceProjectAccess(detail: ProjectAccessEvent) {
if (typeof window !== "undefined")
window.dispatchEvent(new CustomEvent(PROJECT_ACCESS_EVENT, { detail }));
}
/** Match the project in a BFF request, not whichever project is selected later. */
export function projectFromRequest(url: string): ProjectRef | null {
try {
const path = new URL(url, "https://kart.invalid").pathname;
const match = path.match(/\/(?:project|quota|derived|bookmark|export|import|share)\/([01])\/([^/]+)(?:\/|$)/);
if (!match) return null;
const project = { projectType: Number(match[1]), pkey: decodeURIComponent(match[2]) };
return isProjectRef(project) ? project : null;
} catch {
return null;
}
}
export function projectAccessMessage(error: unknown): string {
const info = apiError(error, { fallbackMessage: "프로젝트 접근 권한을 확인하지 못했습니다. 다시 시도해 주세요." });
return info.code === "PROJECT_ACCESS_DENIED"
? "프로젝트에 접근할 권한이 없습니다."
: info.message;
}
export function projectFromSearch(search: URLSearchParams): ProjectRef | null {
const type = search.get("projectType");
if (search.getAll("projectType").length !== 1 || search.getAll("pkey").length !== 1 ||
(type !== "0" && type !== "1")) return null;
const project = { projectType: Number(type), pkey: search.get("pkey") };
return isProjectRef(project) ? project : null;
}
export function projectPageUrl(pathname: string, project: ProjectRef): string {
const search = new URLSearchParams({ projectType: String(project.projectType), pkey: project.pkey });
return pathname + "?" + search;
}

View File

@@ -2,6 +2,8 @@ const progress = new Set(["day", "type", "loi", "screen"]);
/** Browser inputs select only these implemented read operations, never an arbitrary upstream URL. */
export function isProjectReadPath(slug: string[]): boolean {
if (slug.length === 1) return slug[0] === "list" || slug[0] === "summary";
if (slug.length === 3 && slug[2] === "access")
return isProjectReadPath([slug[0], slug[1], "question", "list"]);
return (
slug.length === 4 &&
(slug[0] === "0" || slug[0] === "1") &&

View File

@@ -12,8 +12,8 @@ export function isProjectPage(path: string): boolean {
}
/**
* Project pages carry no project in the address (legacy KART kept it in client state); the
* selected project lives in useSelectedProject. Other paths open the progress page.
* ProjectEntry verifies and consumes incoming project parameters. Subsequent navigation
* uses the tab's selected project; other paths open the progress page.
*/
export function projectPagePath(path: string): Route {
return (isProjectPage(path) ? path : "/Report/Current") as Route;

View File

@@ -7,6 +7,7 @@ import { isExternalUser } from "@/types/share";
import { nextApi } from "@/lib/http-client";
import { queryKeys } from "@/query/key/keys";
import {
isRecord,
isProject,
isProjectSummary,
isProgressDay,
@@ -18,6 +19,16 @@ import {
type DateRange,
} from "@/types/kart";
/** Always check the server; a cached permission is not an authorization decision. */
export async function checkProjectAccess(project: ProjectRef): Promise<void> {
const result = await nextApi.get<unknown>(
"/project/" + project.projectType + "/" + encodeURIComponent(project.pkey) + "/access",
{ cache: "no-store" },
);
if (!isRecord(result) || result.allowed !== true)
throw new Error("프로젝트 접근 권한 응답을 확인해 주세요.");
}
export function useProjectListQuery() {
const { auth, hydrated } = useAuth();
const user = auth.user;

View File

@@ -6,5 +6,5 @@ export const StorageKeys = {
export type StorageKey = (typeof StorageKeys)[keyof typeof StorageKeys];
export const StorageType: Record<StorageKey, "local" | "session"> = {
[StorageKeys.AuthState]: "local",
[StorageKeys.SelectedProject]: "local",
[StorageKeys.SelectedProject]: "session",
};