From 7f9cbe4f09344a0c1c583fb67f96327fbe0dcf51 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Tue, 3 Nov 2026 10:48:30 +0900 Subject: [PATCH 1/2] =?UTF-8?q?261103=5F02=5FFIX:=20=EB=8B=A4=EB=A5=B8=20?= =?UTF-8?q?=EC=84=9C=EB=B9=84=EC=8A=A4=EC=99=80=20=EB=8F=84=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=20=EC=9D=B8=EC=A6=9D=20=EA=B2=B9=EC=B9=98=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EB=8F=84=EB=A1=9D=20=ED=82=A4=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/cookie/cookie-keys.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/store/cookie/cookie-keys.ts b/src/store/cookie/cookie-keys.ts index c2617b3..06d57c2 100644 --- a/src/store/cookie/cookie-keys.ts +++ b/src/store/cookie/cookie-keys.ts @@ -1,6 +1,6 @@ export const CookieKeys = { FontSize: "kri_fontSize", - AuthToken: "kri_authToken", + AuthToken: "kri_internal_authToken", // 필요하면 여기 계속 추가 (예: Theme: "kri_theme", ...) } as const; From dd4fc8f2304b381851dc4bc6add0ad0457b8aa77 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Tue, 3 Nov 2026 15:11:33 +0900 Subject: [PATCH 2/2] =?UTF-8?q?261103=5F03=5FENH:=20=EA=B3=B5=EC=9C=A0=20?= =?UTF-8?q?=EC=9D=B8=EC=A6=9D=20=EC=82=AC=EC=9A=A9=EC=9E=90=20=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EB=8F=99=EA=B8=B0=ED=99=94=20=EB=B0=8F=20=ED=94=84?= =?UTF-8?q?=EB=A1=9C=EC=A0=9D=ED=8A=B8=20=EC=A0=91=EA=B7=BC=20=EC=A0=84?= =?UTF-8?q?=ED=99=98=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/(pages)/(main)/layout.tsx | 5 +- src/app/api/auth/[[...slug]]/route.ts | 22 ++++++ src/components/app-shell/AuthSessionGate.tsx | 19 +++++ src/hooks/useAuthSession.ts | 77 ++++++++++++++++++++ src/lib/auth-user.ts | 10 +++ src/lib/security.ts | 6 +- 6 files changed, 134 insertions(+), 5 deletions(-) create mode 100644 src/app/api/auth/[[...slug]]/route.ts create mode 100644 src/components/app-shell/AuthSessionGate.tsx create mode 100644 src/hooks/useAuthSession.ts create mode 100644 src/lib/auth-user.ts diff --git a/src/app/(pages)/(main)/layout.tsx b/src/app/(pages)/(main)/layout.tsx index f8eb548..bad0810 100644 --- a/src/app/(pages)/(main)/layout.tsx +++ b/src/app/(pages)/(main)/layout.tsx @@ -1,3 +1,4 @@ +import { AuthSessionGate } from "@/components/app-shell/AuthSessionGate"; import AppMainLayout from "@/components/app-shell/AppMainLayout"; import { cookies } from "next/headers"; import { redirect } from "next/navigation"; @@ -31,8 +32,8 @@ export default async function MainLayoutWrapper({ } return ( - + {children} - + ); } diff --git a/src/app/api/auth/[[...slug]]/route.ts b/src/app/api/auth/[[...slug]]/route.ts new file mode 100644 index 0000000..8247250 --- /dev/null +++ b/src/app/api/auth/[[...slug]]/route.ts @@ -0,0 +1,22 @@ +import { NextResponse } from "next/server"; +import { errorToResponse } from "@kri/common/http"; +import { createContactApi } from "@/lib/http-server"; +import {isLoginUser} from "@/lib/auth-user"; + +export async function GET(_request: Request, context: { params: Promise<{ slug?: string[] }> }) { + const { slug = [] } = await context.params; + if (slug.length !== 1 || slug[0] !== "my-info") + return NextResponse.json({ message: "Not found" }, { status: 404, headers: { "Cache-Control": "no-store" } }); + try { + const api = await createContactApi(); + const user = await api.get("/auth/my-info", { cache: "no-store" }); + if (!isLoginUser(user)) { + return NextResponse.json({ message: "Invalid user response" }, { status: 502, headers: { "Cache-Control": "no-store" } }); + } + return NextResponse.json({ userId: user.userId, userName: user.userName, userCmpn: user.userCmpn, userTeam: user.userTeam, userRole: user.userRole }, { headers: { "Cache-Control": "no-store" } }); + } catch (error) { + const response = errorToResponse(error); + response.headers.set("Cache-Control", "no-store"); + return response; + } +} diff --git a/src/components/app-shell/AuthSessionGate.tsx b/src/components/app-shell/AuthSessionGate.tsx new file mode 100644 index 0000000..a759aa7 --- /dev/null +++ b/src/components/app-shell/AuthSessionGate.tsx @@ -0,0 +1,19 @@ +"use client"; + +import type { ReactNode } from "react"; +import { useAuthSession } from "@/hooks/useAuthSession"; + +export function AuthSessionGate({ children }: { children: ReactNode }) { + const session = useAuthSession(); + const user = session.data; + const checking = session.isPending || session.isFetching; + const identity = user && JSON.stringify([user.userId, user.userRole, user.userTeam, user.userCmpn]); + + return <> + {session.isError && !checking &&
+

로그인 정보를 확인하지 못했습니다.

+ +
} + {user && } + ; +} diff --git a/src/hooks/useAuthSession.ts b/src/hooks/useAuthSession.ts new file mode 100644 index 0000000..46b4291 --- /dev/null +++ b/src/hooks/useAuthSession.ts @@ -0,0 +1,77 @@ +"use client"; + +import { useEffect } from "react"; +import { useAtomValue, useStore } from "jotai"; +import { useQuery, useQueryClient } from "@tanstack/react-query"; +import { useRouter } from "next/navigation"; +import { apiError } from "@kri/common/http"; +import { authStateAtom, useAuth } from "@/hooks/useAuth"; +import { selectedProjectAtom, selectedProjectHydratedAtom } from "@/store/jotai/project"; +import { nextApi } from "@/lib/http-client"; +import { isLoginUser } from "@/lib/auth-user"; + +const SESSION_QUERY_KEY = ["auth-session"] as const; + +export function useAuthSession() { + const store = useStore(); + const queryClient = useQueryClient(); + const router = useRouter(); + const { setAuth } = useAuth(); + useAtomValue(selectedProjectAtom); + const projectHydrated = useAtomValue(selectedProjectHydratedAtom); + const otherQueries = { predicate: (query: { queryKey: readonly unknown[] }) => query.queryKey[0] !== SESSION_QUERY_KEY[0] }; + + useEffect(() => { + const refresh = () => { + void queryClient.refetchQueries({ queryKey: SESSION_QUERY_KEY, exact: true, type: "active" }, { cancelRefetch: false }); + }; + window.addEventListener("focus", refresh); + return () => window.removeEventListener("focus", refresh); + }, [queryClient]); + + return useQuery({ + queryKey: SESSION_QUERY_KEY, + enabled: projectHydrated, + staleTime: 0, + gcTime: 0, + retry: false, + refetchOnMount: "always", + refetchOnWindowFocus: "always", + meta: { ignoreGlobalLoading: true }, + queryFn: async ({ signal }) => { + const previous = store.get(authStateAtom); + try { + const user = await nextApi.get("/auth/my-info", { + cache: "no-store", + skipUnauthorizedHandler: true, skipForbiddenHandler: true, skipResponseErrorHandler: true, + }); + signal.throwIfAborted(); + if (!isLoginUser(user)) throw new Error("Invalid user response"); + const before = previous.user; + const changed = !before || before.userId !== user.userId || before.userRole !== user.userRole || + before.userTeam !== user.userTeam || before.userCmpn !== user.userCmpn; + if (changed) { + await queryClient.cancelQueries(otherQueries); + signal.throwIfAborted(); + queryClient.removeQueries(otherQueries); + queryClient.getMutationCache().clear(); + } + if (changed || before?.userName !== user.userName) setAuth({ user }); + return user; + } catch (reason) { + signal.throwIfAborted(); + const status = apiError(reason).status; + if (status === 401 || status === 403) { + await queryClient.cancelQueries(otherQueries); + signal.throwIfAborted(); + queryClient.removeQueries(otherQueries); + queryClient.getMutationCache().clear(); + store.set(selectedProjectAtom, null); + setAuth({ user: null }); + router.replace("/login"); + } + throw reason; + } + }, + }); +} diff --git a/src/lib/auth-user.ts b/src/lib/auth-user.ts new file mode 100644 index 0000000..e2605d4 --- /dev/null +++ b/src/lib/auth-user.ts @@ -0,0 +1,10 @@ +import {LoginUser} from "@kri/common"; + +export function isLoginUser(value: unknown): value is LoginUser { + if (!value || typeof value !== "object" || Array.isArray(value)) return false; + return "userId" in value && typeof value.userId === "string" && value.userId.length > 0 && + "userName" in value && typeof value.userName === "string" && + "userCmpn" in value && typeof value.userCmpn === "string" && + "userTeam" in value && typeof value.userTeam === "string" && + "userRole" in value && typeof value.userRole === "number" && Number.isSafeInteger(value.userRole); +} \ No newline at end of file diff --git a/src/lib/security.ts b/src/lib/security.ts index 65f51ef..94f6136 100644 --- a/src/lib/security.ts +++ b/src/lib/security.ts @@ -15,14 +15,14 @@ export const Security = createSecurity({ } const target = window as Window & { - __kfpaCryptoConfigAlerted?: boolean; + __kriContactCryptoConfigAlerted?: boolean; }; - if (target.__kfpaCryptoConfigAlerted) { + if (target.__kriContactCryptoConfigAlerted) { return; } - target.__kfpaCryptoConfigAlerted = true; + target.__kriContactCryptoConfigAlerted = true; window.alert(message); }, });