Merge remote-tracking branch 'origin/main' into iipbs/wr/dev

apps/as/app/api/proxy/[...url]/route.ts

@@ -68,7 +68,7 @@ async function handler(
         cookieStore.set(REFRESH_TOKEN, refreshToken, {
           httpOnly: true,
           sameSite: "strict",
-          domain: getCookieDomain(),
+          domain: COOKIE_DOMAIN,
           path: "/",
         });
       }
@@ -92,14 +92,3 @@ 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;
-}

apps/as/next.config.ts

@@ -1,6 +1,7 @@
 import type { NextConfig } from "next";
 
 const nextConfig: NextConfig = {
+  output: "standalone",
   reactStrictMode: true,
   transpilePackages: ["@common/assets"],
 };

apps/cm/app/api/proxy/[...url]/route.ts

@@ -2,6 +2,7 @@ import {
   ACCESS_TOKEN,
   AUTH_USER_ID,
   CLAIM_NAME,
+  COOKIE_DOMAIN,
   REFRESH_TOKEN,
   SERVER_API_URL,
   SITE_ID,
@@ -135,6 +136,7 @@ async function handler(
         cookieStore.set(REFRESH_TOKEN, refreshToken, {
           httpOnly: true,
           sameSite: "lax",
+          domain: COOKIE_DOMAIN,
           path: "/",
         });
       }

apps/cs/app/api/proxy/[...url]/route.ts

@@ -70,7 +70,7 @@ async function handler(
         response.cookies.set(REFRESH_TOKEN, refreshToken, {
           httpOnly: true,
           sameSite: "strict",
-          domain: getCookieDomain(),
+          domain: COOKIE_DOMAIN,
           path: "/",
         });
       }
@@ -105,14 +105,3 @@ export async function PUT(
   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;
-}

apps/cs/middleware.ts

@@ -41,7 +41,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);
@@ -58,7 +58,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,
@@ -83,7 +83,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,
@@ -97,7 +97,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/next.config.ts

@@ -18,7 +18,7 @@ const nextConfig: NextConfig = {
     fetches: {
       fullUrl: true,
     },
-  },  
+  },
   async headers() {
     return [
       {

apps/st/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,
@@ -75,6 +76,7 @@ async function handler(
                 cookieStore.set(REFRESH_TOKEN, refreshToken, {
                     httpOnly: true,
                     sameSite: "lax",
+                    domain: COOKIE_DOMAIN,
                     path: "/",
                 });
             }

apps/st/next.config.ts

@@ -1,47 +1,47 @@
 import type { NextConfig } from "next";
 
 const subDomain =
-  process.env.NEXT_PUBLIC_SUB_DOMAIN || "http://localhost:13000";
+    process.env.NEXT_PUBLIC_SUB_DOMAIN || "http://localhost:13000";
 
 const nextConfig: NextConfig = {
-  // output: "standalone",
+    output: "standalone",
-  async headers() {
+    async headers() {
-    return [
+        return [
-      {
-        source: "/(.*)",
-        headers: [
-          {
-            key: "Content-Security-Policy",
-            value: "img-src 'self' data: https: blob:;",
-          },
-        ],
-      },
-    ];
-  },
-  async rewrites() {
-    return {
-      beforeFiles: [
-        {
-          source: "/_next/static/:path*",
-          destination: `${subDomain}/_next/static/:path*`,
-          has: [
             {
-              type: "header",
+                source: "/(.*)",
-              key: "referer",
+                headers: [
-              value: "(.*)/cms(.*)",
+                    {
+                        key: "Content-Security-Policy",
+                        value: "img-src 'self' data: https: blob:;",
+                    },
+                ],
             },
-          ],
+        ];
-        },
+    },
-      ],
+    async rewrites() {
-      afterFiles: [
+        return {
-        {
+            beforeFiles: [
-          source: "/cms/:path*",
+                {
-          destination: `${subDomain}/cms/:path*`,
+                    source: "/_next/static/:path*",
-        },
+                    destination: `${subDomain}/_next/static/:path*`,
-      ],
+                    has: [
-      fallback: [],
+                        {
-    };
+                            type: "header",
-  },
+                            key: "referer",
+                            value: "(.*)/cms(.*)",
+                        },
+                    ],
+                },
+            ],
+            afterFiles: [
+                {
+                    source: "/cms/:path*",
+                    destination: `${subDomain}/cms/:path*`,
+                },
+            ],
+            fallback: [],
+        };
+    },
 };
 
 export default nextConfig;

apps/st/src/pages/statistics/ui/panels/schedule-info-panel.tsx

@@ -84,7 +84,7 @@ export function ScheduleInfoPanel({ params }: ScheduleInfoPanelProps) {
                             <div className="space-y-2">
                                 <div className="flex items-center justify-between rounded-sm border border-border p-3">
                                     <Badge size="lg" className="font-semibold">
-                                        {data.inptSeCd}차 입력기간
+                                        입력기간
                                     </Badge>
                                     <p className="text-2xl">
                                         {dayjs(data.inptBgngYmd).format(
@@ -102,7 +102,7 @@ export function ScheduleInfoPanel({ params }: ScheduleInfoPanelProps) {
                                         color="gray"
                                         className="font-semibold"
                                     >
-                                        {data.vrfcSeCd}차 검증기간
+                                        검증기간
                                     </Badge>
                                     <p className="text-2xl">
                                         {dayjs(data.vrfcBgngYmd).format(

packages/common/components/src/api/banner.ts

@@ -1,35 +1,31 @@
-import { getApiClient } from "./client";
 import { getConfig } from "@common/config";
 import { ENDPOINT } from "../config";
+import { getAuthHeaders } from "../lib/auth-header";
 
 export interface Banner {
-    bnrSn: number;
+  bnrSn: number;
-    bnrTypeCd: string;
+  bnrTypeCd: string;
-    bnrTypeNm: string;
+  bnrTypeNm: string;
-    bnrTtl: string;
+  bnrTtl: string;
-    lnkgUrlAddr: string;
+  lnkgUrlAddr: string;
-    useYn: string;
+  useYn: string;
-    atflCd: string;
+  atflCd: string;
-    mdfcnDt: string;
+  mdfcnDt: string;
-    mdfr: string;
+  mdfr: string;
-    mdfrNm: string;
+  mdfrNm: string;
-  }
+}
 
+const { PROXY_HOST } = getConfig();
+const BASE_URL = `${PROXY_HOST}/server`;
 
-  const { PROXY_HOST } = getConfig();
+export const getBannerList = async (siteId: string): Promise<Banner[]> => {
-  const BASE_URL = `${PROXY_HOST}/server`;
+  const response = await fetch(
-
-const client = getApiClient();
-
-export const getBannerList = async (siteId: string) => {
-  const response = await client.get<Banner[]>(
     `${BASE_URL}${ENDPOINT.CMS_SERVICE.BANNERS}/${siteId}`,
     {
       method: "GET",
-      headers: {
+      headers: getAuthHeaders(),
-        "Content-Type": "application/json",
+      credentials: "include",
-      },
     },
   );
-  return response.data;
+  return response.json();
 };

packages/common/components/src/api/menu.ts

@@ -1,4 +1,4 @@
-import { getApiClient } from "./client";
+import { getAuthHeaders } from "../lib/auth-header";
 import { ENDPOINT } from "../config";
 import { getConfig } from "@common/config";
 
@@ -27,22 +27,33 @@ export interface TreeMenu extends MenuItem {
   menuHlpCn: string;
 }
 
-const client = getApiClient();
 const { PROXY_HOST } = getConfig();
 const BASE_URL = `${PROXY_HOST}/server`;
 
-export const getMenuList = async (siteId: string) => {
+export const getMenuList = async (siteId: string): Promise<MenuItem[]> => {
-  const response = await client.get<MenuItem[]>(
+  const response = await fetch(
-    `${ENDPOINT.CMS_SERVICE.MENU_ROLES}/${siteId}`,
+    `${BASE_URL}${ENDPOINT.CMS_SERVICE.MENU_ROLES}/${siteId}`,
+    {
+      method: "GET",
+      headers: getAuthHeaders(),
+      credentials: "include",
+    },
   );
-  return response.data;
+  return response.json();
 };
 
-export const getPreviewTreeMenuList = async (siteId: string) => {
+export const getPreviewTreeMenuList = async (
-  const response = await client.get<TreeMenu[]>(
+  siteId: string,
-    `${ENDPOINT.CMS_SERVICE.MENUS}/${siteId}/tree/preview`,
+): Promise<TreeMenu[]> => {
+  const response = await fetch(
+    `${BASE_URL}${ENDPOINT.CMS_SERVICE.MENUS}/${siteId}/tree/preview`,
+    {
+      method: "GET",
+      headers: getAuthHeaders(),
+      credentials: "include",
+    },
   );
-  return response.data;
+  return response.json();
 };
 
 export const getAnonymouseMenuList = async (
@@ -52,9 +63,8 @@ export const getAnonymouseMenuList = async (
     `${BASE_URL}${ENDPOINT.CMS_SERVICE.MENU_ANONYMOUS}/user/${siteId}`,
     {
       method: "GET",
-      headers: {
+      headers: getAuthHeaders(),
-        "Content-Type": "application/json",
+      credentials: "include",
-      },
     },
   );
   return response.json();

packages/common/components/src/api/site.ts

@@ -1,6 +1,6 @@
-import { getApiClient } from "./client";
 import { getConfig } from "@common/config";
 import { ENDPOINT } from "../config";
+import { getAuthHeaders } from "../lib/auth-header";
 
 export interface SiteInfo {
   siteId: string;
@@ -62,25 +62,18 @@ export const getSiteInfo = async (siteId: string) => {
     `${BASE_URL}${ENDPOINT.CMS_SERVICE.SITES}/${siteId}`,
     {
       method: "GET",
-      headers: {
+      headers: getAuthHeaders(),
-        "Content-Type": "application/json",
+      credentials: "include",
-      },
     },
   );
   return response.json() as Promise<SiteInfo>;
 };
 
-const client = getApiClient();
+export const getSiteList = async (): Promise<SiteListResponse> => {
-
+  const response = await fetch(`${BASE_URL}${ENDPOINT.CMS_SERVICE.SITE_LIST}`, {
-export const getSiteList = async () => {
+    method: "GET",
-  const response = await client.get<SiteListResponse>(
+    headers: getAuthHeaders(),
-    `${BASE_URL}${ENDPOINT.CMS_SERVICE.SITE_LIST}`,
+    credentials: "include",
-    {
+  });
-      method: "GET",
+  return response.json();
-      headers: {
-        "Content-Type": "application/json",
-      },
-    },
-  );
-  return response.data;
 };

packages/common/components/src/lib/auth-header.ts

@@ -0,0 +1,22 @@
+import Cookies from "js-cookie";
+import { getConfig } from "@common/config";
+
+export function getAuthHeaders(): HeadersInit {
+  const { CLAIM_NAME, AUTH_USER_ID } = getConfig();
+
+  if (!CLAIM_NAME || !AUTH_USER_ID) {
+    throw new Error("Required environment variables are not set");
+  }
+
+  const headers: Record<string, string> = {
+    "Content-Type": "application/json",
+  };
+
+  const token = Cookies.get(CLAIM_NAME);
+  const userId = Cookies.get(AUTH_USER_ID);
+
+  if (token) headers[CLAIM_NAME] = token;
+  if (userId) headers[AUTH_USER_ID] = userId;
+
+  return headers;
+}

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

@@ -12,8 +12,6 @@ import {
   CarouselPrevious,
 } from "../carousel";
 
-const siteId = getCookie("site-id-key") ?? "";
-
 type BannerImageProps = {
   atflCd: string;
   bnrSn: number;
@@ -64,6 +62,8 @@ const BannerImage = ({ atflCd, lnkgUrlAddr }: BannerImageProps) => {
 };
 
 export function Footer() {
+  const siteId = getCookie("site-id-key") ?? "";
+
   const { data: siteInfo } = useQuery({
     queryKey: [ENDPOINT.CMS_SERVICE.SITES, siteId],
     queryFn: () => getSiteInfo(siteId),

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

@@ -29,7 +29,6 @@ import { ScrollArea, ScrollBar } from "../scroll-area";
 
 const appConfig = getConfig();
 const userId = getCookie(appConfig.AUTH_USER_ID ?? "");
-const siteId = getCookie("site-id-key") ?? "";
 const isLoggedIn = !!userId;
 
 function getRootDomain(hostname: string): string {
@@ -144,6 +143,7 @@ export function Header({
   const [isMobileMenuOpen, setIsMobileMenuOpen] = useState(false);
   const logoRef = useRef<HTMLImageElement>(null);
   const remainingMs = useTokenRemainingMs(mounted && isLoggedIn && !viewOnly);
+  const siteId = getCookie("site-id-key") ?? "";
 
   useSessionExtendConfirm({
     enabled:

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

@@ -8,15 +8,18 @@ import { SidebarProvider } from "../sidebar";
 import { LNB } from "../lnb";
 import { Header } from "../header";
 import "./common.css";
+import type { AuthService } from "@common/auth";
 
 export function NoFooterLayout({
   children,
   queryClient,
+  authService,
   currentPath,
   handleMenuClick,
 }: {
   children: React.ReactNode;
   queryClient?: QueryClient;
+  authService?: AuthService;
   currentPath?: string;
   handleMenuClick?: (item: MenuItem) => void;
 }) {
@@ -26,19 +29,19 @@ export function NoFooterLayout({
         <PopupProvider>
           <HelpDialogProvider>
             <SidebarProvider>
-            <div className="flex-1">
+              <div className="flex-1">
-              <Header />
+                <Header authService={authService} />
-              <div className="flex">
+                <div className="flex">
-                <LNB
+                  <LNB
-                  currentPath={currentPath}
+                    currentPath={currentPath}
-                  handleMenuClick={handleMenuClick}
+                    handleMenuClick={handleMenuClick}
-                />
+                  />
-                <div className="flex min-h-[calc(100vh-50px)] flex-1 flex-col overflow-auto">
+                  <div className="flex min-h-[calc(100vh-50px)] flex-1 flex-col overflow-auto">
-                  <div className="flex-1">{children}</div>
+                    <div className="flex-1">{children}</div>
+                  </div>
                 </div>
               </div>
-            </div>
+            </SidebarProvider>
-          </SidebarProvider>
           </HelpDialogProvider>
         </PopupProvider>
       </ClientIpGuard>

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

@@ -6,7 +6,6 @@ import { HelpDialogProvider } from "../../provider/help-dialog-context";
 import { ClientIpGuard } from "../../lib/client-ip-guard";
 import type { MenuItem } from "../../api";
 import { SidebarProvider } from "../sidebar";
-import { LNB } from "../lnb";
 import { Header } from "../header";
 import { Footer } from "../footer";
 import "./common.css";
@@ -17,7 +16,6 @@ export function NoLNBLayout({
   authService,
   tokenManager,
   currentPath,
-  handleMenuClick,
 }: {
   children: React.ReactNode;
   queryClient?: QueryClient;
@@ -33,19 +31,19 @@ export function NoLNBLayout({
         <PopupProvider>
           <HelpDialogProvider>
             <SidebarProvider>
-            <div className="flex-1">
+              <div className="flex-1">
-              <Header
+                <Header
-                authService={authService}
+                  authService={authService}
-                tokenManager={authService ? undefined : tokenManager}
+                  tokenManager={authService ? undefined : tokenManager}
-              />
+                />
-              <div className="flex">
+                <div className="flex">
-                <div className="flex min-h-[calc(100vh-50px)] flex-1 flex-col overflow-auto">
+                  <div className="flex min-h-[calc(100vh-50px)] flex-1 flex-col overflow-auto">
-                  <div className="flex-1">{children}</div>
+                    <div className="flex-1">{children}</div>
-                  <Footer />
+                    <Footer />
+                  </div>
                 </div>
               </div>
-            </div>
+            </SidebarProvider>
-          </SidebarProvider>
           </HelpDialogProvider>
         </PopupProvider>
       </ClientIpGuard>

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

@@ -42,7 +42,6 @@ import {
 
 const appConfig = getConfig();
 const userId = getCookie(appConfig.AUTH_USER_ID ?? "");
-const appSiteId = getCookie("site-id-key") ?? "";
 const isLoggedIn = !!userId;
 
 export function LNB({
@@ -74,6 +73,7 @@ export function LNB({
     helpContent,
   } = useHelpDialog();
 
+  const appSiteId = getCookie("site-id-key") ?? "";
   const siteId = propSiteId ?? appSiteId;
 
   const { data: menuListData } = useQuery({

pnpm-lock.yaml

@@ -247,9 +247,9 @@ importers:
       '@common/components':
         specifier: workspace:*
         version: link:../../packages/common/components
-      '@common/config':
+      '@common/network':
         specifier: workspace:*
-        version: link:../../packages/common/config
+        version: link:../../packages/common/network
       '@dnd-kit/core':
         specifier: ^6.3.1
         version: 6.3.1(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
@@ -1042,6 +1042,9 @@ importers:
       js-cookie:
         specifier: ^3.0.5
         version: 3.0.5
+      lucide-react:
+        specifier: ^0.474.0
+        version: 0.474.0(react@19.2.4)
       moment:
         specifier: ^2.30.1
         version: 2.30.1