Merge branch 'main' of https://www.onasys.co.kr:3000/ONAANDALL/frontend into deploy

apps/cs/app/(with-base-layout)/layout.tsx

@@ -6,6 +6,7 @@ import { BaseLayout } from "@common/components";
 import type { MenuItem } from "@/entities/menu";
 import { useMenuStore } from "@/shared/lib";
 import { PageLayout } from "@/shared/ui/page-layout";
+import { tokenManager } from "@/entities/auth";
 
 export default function WithBaseLayout({
   children,
@@ -26,6 +27,7 @@ export default function WithBaseLayout({
   return (
     <BaseLayout
       queryClient={queryClient}
+      tokenManager={tokenManager}
       currentPath={pathname ?? ""}
       handleMenuClick={handleMenuClick}
     >

apps/cs/app/api/auth/logout/route.ts

@@ -4,20 +4,14 @@ import {
   ACCESS_TOKEN,
   AUTH_USER_ID,
   CLAIM_NAME,
-  COOKIE_DOMAIN,
   REFRESH_TOKEN,
 } from "@/shared/config";
 
-const cookieOptions = {
-  path: "/",
-  domain: COOKIE_DOMAIN,
-};
-
 export async function POST() {
   const cookieStore = await cookies();
-  cookieStore.delete({ name: ACCESS_TOKEN, ...cookieOptions });
-  cookieStore.delete({ name: REFRESH_TOKEN, ...cookieOptions });
-  cookieStore.delete({ name: AUTH_USER_ID, ...cookieOptions });
-  cookieStore.delete({ name: CLAIM_NAME, ...cookieOptions });
+  cookieStore.delete(ACCESS_TOKEN);
+  cookieStore.delete(REFRESH_TOKEN);
+  cookieStore.delete(AUTH_USER_ID);
+  cookieStore.delete(CLAIM_NAME);
   return NextResponse.json({ message: "Logged out" }, { status: 200 });
 }

apps/cs/middleware.ts

@@ -37,7 +37,7 @@ export function middleware(req: NextRequest) {
 
     logMessages.push(`  Rewritten URL: ${newUrl}`);
     logMessages.push("\n--------------------------------\n");
-    console.log(logMessages.join("\n"));
+    // console.log(logMessages.join("\n"));
 
     const response = NextResponse.rewrite(new URL(newUrl));
     return addSecurityHeaders(response);
@@ -54,7 +54,7 @@ export function middleware(req: NextRequest) {
 
     logMessages.push(`  Rewritten URL: ${newUrl}`);
     logMessages.push("\n--------------------------------\n");
-    console.log(logMessages.join("\n"));
+    // console.log(logMessages.join("\n"));
 
     const response = NextResponse.rewrite(new URL(newUrl), {
       headers: requestHeaders,
@@ -79,7 +79,7 @@ export function middleware(req: NextRequest) {
 
     logMessages.push(`  Link API Rewritten URL: ${newUrl}`);
     logMessages.push("\n--------------------------------\n");
-    console.log(logMessages.join("\n"));
+    // console.log(logMessages.join("\n"));
 
     const response = NextResponse.rewrite(new URL(newUrl), {
       headers: requestHeaders,
@@ -93,7 +93,7 @@ export function middleware(req: NextRequest) {
   }
 
   logMessages.push("\n--------------------------------\n");
-  console.log(logMessages.join("\n"));
+  // console.log(logMessages.join("\n"));
   
   const response = NextResponse.next();
   return addSecurityHeaders(response);

apps/cs/src/entities/auth/index.ts

@@ -1,2 +1,3 @@
 export { login, silentRefresh, logout } from "./api/auth-service";
 export { AuthWrapper } from "./lib/auth-wrapper";
+export { tokenManager } from "./lib/token-manager";

packages/common/auth/token-manager.ts

@@ -1,5 +1,5 @@
+import { getCookie, removeCookie, setCookie } from "./cookie";
 import type { AuthConfig } from "./types";
-import { getCookie, setCookie, removeCookie } from "./cookie";
 
 export function createTokenManager(config: AuthConfig) {
   let refreshTimer: ReturnType<typeof setTimeout> | null = null;

packages/common/components/package.json

@@ -27,7 +27,9 @@
   },
   "dependencies": {
     "@common/assets": "workspace:*",
+    "@common/auth": "workspace:*",
     "@common/config": "workspace:*",
+    "@common/network": "workspace:*",
     "@frontend-opensource/use-react-hooks": "^1.1.4",
     "@minoru/react-dnd-treeview": "^3.5.0",
     "@radix-ui/react-accordion": "^1.2.3",

packages/common/components/src/ui/header/index.tsx

@@ -3,9 +3,10 @@ import "./header.css";
 import { useEffect, useCallback, useState, useRef } from "react";
 import { useQuery } from "@tanstack/react-query";
 import { images } from "@common/assets";
+import type { TokenManager } from "@common/auth";
 import { getConfig } from "@common/config";
 import { ENDPOINT } from "../../config";
-import { setCookie, getCookie, removeCookie } from "../../lib";
+import { setCookie, getCookie } from "../../lib";
 import {
   getPopupInfo,
   getUserPopupList,
@@ -28,7 +29,7 @@ const userId = getCookie(appConfig.AUTH_USER_ID ?? "");
 const siteId = getCookie("site-id-key") ?? "";
 const isLoggedIn = !!userId;
 
-export function Header({ viewOnly }: { viewOnly?: boolean }) {
+export function Header({ tokenManager, viewOnly }: { tokenManager?: TokenManager; viewOnly?: boolean }) {
   const [mounted, setMounted] = useState(false);
   const [logoWidth, setLogoWidth] = useState(0);
   const [isMobileMenuOpen, setIsMobileMenuOpen] = useState(false);
@@ -82,7 +83,7 @@ export function Header({ viewOnly }: { viewOnly?: boolean }) {
       // 에러가 나도 계속 진행
     } finally {
       // 2. 클라이언트 쿠키 삭제 (백업)
-      // clearClientCookies();
+      clearClientCookies();
 
       // 3. 로컬/세션 스토리지 정리
       // if (typeof window !== "undefined") {
@@ -96,7 +97,6 @@ export function Header({ viewOnly }: { viewOnly?: boolean }) {
   };
 
   // 쿠키 삭제 헬퍼 함수
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   const clearClientCookies = () => {
     const actualHost = window.location.hostname;
 
@@ -134,12 +134,8 @@ export function Header({ viewOnly }: { viewOnly?: boolean }) {
     cookiesToDelete.forEach((cookieName) => {
       if (!cookieName) return;
 
-      // 방법 1: removeCookie 함수 사용
-      if (domain === "localhost") {
-        removeCookie(cookieName, {});
-      } else {
-        removeCookie(cookieName, { domain });
-      }
+      // 방법 1: removeToken 함수 사용
+      tokenManager?.removeToken(cookieName);
 
       // 방법 2: 직접 document.cookie 설정 (도메인 포함)
       if (domain !== "localhost") {

packages/common/components/src/ui/layout/base.tsx

@@ -1,3 +1,4 @@
+import type { TokenManager } from "@common/auth";
 import type { QueryClient } from "@tanstack/react-query";
 import { QueryProvider } from "../../provider/query-provider";
 import { PopupProvider } from "../../provider/popup-provider";
@@ -13,11 +14,13 @@ import "./common.css";
 export function BaseLayout({
   children,
   queryClient,
+  tokenManager,
   currentPath,
   handleMenuClick,
 }: {
   children: React.ReactNode;
   queryClient?: QueryClient;
+  tokenManager?: TokenManager;
   currentPath?: string;
   handleMenuClick?: (item: MenuItem) => void;
 }) {
@@ -28,7 +31,7 @@ export function BaseLayout({
           <HelpDialogProvider>
             <SidebarProvider>
             <div className="flex-1">
-              <Header />
+              <Header tokenManager={tokenManager} />
               <div className="flex">
                 <LNB
                   currentPath={currentPath}

packages/common/components/tsconfig.json

@@ -14,9 +14,7 @@
     "strict": true,
     "baseUrl": ".",
     "paths": {
-      "@/*": ["src/*"],
-      "@common/config": ["../config/dist/"],
-      "@common/network": ["../network/"]
+      "@/*": ["src/*"]
     }
   },
   "exclude": ["**/node_modules", "**/.*/*", "dist"],