Merge branch 'develop' of https://github.com/PERMIT-SEOUL/permit-fe

pepperdad · pepperdad · commit a413acde4ee5 · 2026-02-02T00:18:26.000+09:00
diff --git a/apps/ticket/src/app/(pages)/event/[eventId]/_clientBoundray/SelectTicketBottomSheet/index.tsx b/apps/ticket/src/app/(pages)/event/[eventId]/_clientBoundray/SelectTicketBottomSheet/index.tsx
@@ -250,7 +250,7 @@ const SelectTicketBottomSheetContent = ({
         // TODO: 토스트나 커스텀 모달로 변경
         alert(error.response?.data.message);
       }
-
+    } finally {
       setIsLoading(false);
     }
   });
diff --git a/apps/ticket/src/app/(pages)/order/[orderId]/_clientBoundary/TossPaymentWidget/index.tsx b/apps/ticket/src/app/(pages)/order/[orderId]/_clientBoundary/TossPaymentWidget/index.tsx
@@ -116,6 +116,9 @@ export const TossPaymentWidget = ({ orderId }: Props) => {
         <Typography type="body14" color="gray300">
           * 환불 정책은 페이지 하단을 참고해주세요.
         </Typography>
+        <Typography type="body14" color="gray300">
+          * 결제창이 계속해서 보이지 않는다면 새로고침 해주세요.
+        </Typography>
       </div>
     </>
   );
diff --git a/apps/ticket/src/app/(pages)/staff/ticket-authorization/_clientBoundary/TicketAuthorizationClient/index.tsx b/apps/ticket/src/app/(pages)/staff/ticket-authorization/_clientBoundary/TicketAuthorizationClient/index.tsx
@@ -7,6 +7,8 @@ import classNames from "classnames/bind";
 import { Flex, Typography } from "@permit/design-system";
 import { useGuestTicketCameraConfirmMutation } from "@/data/tickets/postStaffGuestTicketDoorConfirm/mutation";
 import { useUserTicketCameraConfirmMutation } from "@/data/tickets/postStaffTicketDoorConfirm/mutation";
+import { useUserInfoSuspenseQuery } from "@/data/users/getUserInfo/queries";
+import { ERROR_CODE } from "@/lib/axios/utils/errorCode";
 import { isAxiosErrorResponse } from "@/shared/types/axioxError";
 
 import styles from "./index.module.scss";
@@ -137,6 +139,9 @@ const showToast = (message: string, type: "success" | "error" = "success") => {
 
 export const TicketAuthorizationClient = () => {
   const qc = useQueryClient();
+
+  const { data: userInfoData } = useUserInfoSuspenseQuery({ refetchOnWindowFocus: true });
+
   const [scannedTicketCode, setScannedTicketCode] = useState<string | null>(null);
   const [isGuest, setIsGuest] = useState(false);
   const [lastScannedCode, setLastScannedCode] = useState<string | null>(null);
@@ -303,6 +308,8 @@ export const TicketAuthorizationClient = () => {
             message = "이미 사용한 티켓입니다.";
           } else if (error.response?.data.code === CANCELED_TICKET) {
             message = "취소된 티켓입니다.";
+          } else if (error.response?.data.code === ERROR_CODE.SECURITY_ENTRY) {
+            message = "권한 업데이트를 위해 로그아웃 후 재 로그인 해주세요.";
           } else if (error.response?.data.message) {
             message = error.response?.data.message;
           }
@@ -322,6 +329,18 @@ export const TicketAuthorizationClient = () => {
     verifyTicket();
   }, [scannedTicketCode, isGuest, guestTicketCameraMutate, userTicketCameraMutate]);
 
+  if (userInfoData.role === "USER") {
+    return (
+      <div className={cx("container")}>
+        <Flex className={cx("header")} direction="column" align="center" gap={16}>
+          <Typography type="title18" weight="bold" color="white">
+            접근 권한이 없습니다.
+          </Typography>
+        </Flex>
+      </div>
+    );
+  }
+
   return (
     <div className={cx("container")}>
       <Flex className={cx("header")} direction="column" align="center" gap={16}>
diff --git a/apps/ticket/src/app/api/logout/route.ts b/apps/ticket/src/app/api/logout/route.ts
@@ -1,39 +1,62 @@
+import { ReadonlyRequestCookies } from "next/dist/server/web/spec-extension/adapters/request-cookies";
 import { cookies } from "next/headers";
 import { NextResponse } from "next/server";
 
 import { API_URL } from "@/data/constants";
+import { ERROR_CODE } from "@/lib/axios/utils/errorCode";
 
-/**
- * 로그아웃 요청 API
- */
-export async function POST(req: Request) {
-  const cookiesStore = await cookies();
-
-  const apiRes = await fetch(process.env.NEXT_PUBLIC_TICKET_API_BASE_URL + API_URL.USER.LOGOUT, {
+async function requestLogout(cookiesStore: ReadonlyRequestCookies) {
+  return fetch(process.env.NEXT_PUBLIC_TICKET_API_BASE_URL + API_URL.USER.LOGOUT, {
     method: "POST",
     headers: {
       "Content-Type": "application/json",
       Cookie: `accessToken=${cookiesStore.get("accessToken")?.value}; refreshToken=${cookiesStore.get("refreshToken")?.value}`,
     },
     credentials: "include",
   });
+}
 
-  const setCookies = apiRes.headers.getSetCookie();
+export async function POST() {
+  let apiRes: Response | null = null;
 
-  const res = NextResponse.json(await apiRes.json(), {
-    status: apiRes.status,
-  });
+  try {
+    const cookiesStore = await cookies();
+
+    apiRes = await requestLogout(cookiesStore);
+
+    const data = await apiRes.clone().json();
 
-  // API 서버가 내려준 모든 Set-Cookie를 그대로 전달
-  for (const cookie of setCookies) {
-    // 기존 쿠키 그대로 전달
-    // SSR 환경에서 브라우저 쿠키 사용할 수 있도록 하기 위함
-    res.headers.append("Set-Cookie", cookie);
+    if (data?.code === ERROR_CODE.ACCESS_TOKEN_EXPIRED) {
+      await fetch(`${process.env.NEXT_PUBLIC_BASE_URL}/api/reissue`, {
+        method: "POST",
+        credentials: "include",
+      });
 
-    // Domain 추가한 쿠키 한 번 더 전달
-    // 브라우저 단에서 자동으로 쿠키가 포함한 요청이 갈 수 있도록 하기 위함
-    res.headers.append("Set-Cookie", `${cookie}; Domain=.permitseoul.com`);
+      apiRes = await requestLogout(await cookies());
+    }
+  } catch (e) {
+    // ❗ 실패해도 무시
   }
 
+  const res = NextResponse.json({ success: true }, { status: 200 });
+
+  // 성공/실패 무관하게 쿠키 제거
+  clearAuthCookies(res);
+
   return res;
 }
+
+function clearAuthCookies(res: NextResponse) {
+  for (const name of ["accessToken", "refreshToken"]) {
+    res.headers.append(
+      "Set-Cookie",
+      `${name}=; Path=/; Max-Age=0; HttpOnly; Secure; SameSite=None`,
+    );
+
+    // 도메인 쿠키까지 같이 제거
+    res.headers.append(
+      "Set-Cookie",
+      `${name}=; Path=/; Domain=.permitseoul.com; Max-Age=0; HttpOnly; Secure; SameSite=None`,
+    );
+  }
+}
diff --git a/apps/ticket/src/app/api/reissue/route.ts b/apps/ticket/src/app/api/reissue/route.ts
@@ -18,6 +18,10 @@ export async function POST(req: Request) {
     },
   );
 
+  if (!apiRes.ok) {
+    throw new Error("Token reissue failed");
+  }
+
   const setCookies = apiRes.headers.getSetCookie();
 
   const res = NextResponse.json(await apiRes.json(), {
diff --git a/apps/ticket/src/app/api/sign-up/route.ts b/apps/ticket/src/app/api/sign-up/route.ts
@@ -0,0 +1,37 @@
+import { NextResponse } from "next/server";
+
+import { API_URL } from "@/data/constants";
+
+/**
+ * 회원가입 요청 API
+ * NOTE: API 서버에서 Set-Cookie 설정해주는 것을 브라우저에서 동일하게 쿠키 설정하기 위함
+ */
+export async function POST(req: Request) {
+  const body = await req.json();
+
+  const apiRes = await fetch(process.env.NEXT_PUBLIC_TICKET_API_BASE_URL + API_URL.USER.SIGNUP, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify(body),
+    credentials: "include",
+  });
+
+  const setCookies = apiRes.headers.getSetCookie();
+
+  const res = NextResponse.json(await apiRes.json(), {
+    status: apiRes.status,
+  });
+
+  // API 서버가 내려준 모든 Set-Cookie를 그대로 전달
+  for (const cookie of setCookies) {
+    // 기존 쿠키 그대로 전달
+    // SSR 환경에서 브라우저 쿠키 사용할 수 있도록 하기 위함
+    res.headers.append("Set-Cookie", cookie);
+
+    // Domain 추가한 쿠키 한 번 더 전달
+    // 브라우저 단에서 자동으로 쿠키가 포함한 요청이 갈 수 있도록 하기 위함
+    res.headers.append("Set-Cookie", `${cookie}; Domain=.permitseoul.com`);
+  }
+
+  return res;
+}
diff --git a/apps/ticket/src/data/users/getUserInfo/types.ts b/apps/ticket/src/data/users/getUserInfo/types.ts
@@ -7,4 +7,6 @@ export type UserInfo = {
   gender: string;
   /** 회원 이메일 */
   email: string;
+  /** 회원 role */
+  role: "USER" | "ADMIN" | "STAFF";
 };
diff --git a/apps/ticket/src/data/users/postUserLogout/mutation.ts b/apps/ticket/src/data/users/postUserLogout/mutation.ts
@@ -22,6 +22,10 @@ export const useLogoutMutation = (options?: LogoutMutationOptions<LogoutResponse
         credentials: "include",
       });
 
+      if (!res.ok) {
+        throw new Error("Logout failed");
+      }
+
       return res.json();
     },
     ...options,
diff --git a/apps/ticket/src/data/users/postUserSignup/mutation.ts b/apps/ticket/src/data/users/postUserSignup/mutation.ts
@@ -1,7 +1,5 @@
 import { useMutation, UseMutationOptions } from "@tanstack/react-query";
 
-import { API_URL } from "@/data/constants";
-import { instance } from "@/lib/axios";
 import { SocialLoginType } from "@/shared/hooks/useOAuth/types";
 
 type SignupRequest = {
@@ -27,9 +25,16 @@ export type SignupMutationOptions<TData> = Omit<
 export const useSignupMutation = (options?: SignupMutationOptions<SignupResponse>) => {
   return useMutation({
     mutationFn: async (params: SignupRequest) => {
-      const { data } = await instance.post<SignupResponse>(API_URL.USER.SIGNUP, params);
+      const res = await fetch("/api/sign-up", {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        credentials: "include",
+        body: JSON.stringify(params),
+      });
 
-      return data;
+      return res.json();
     },
     ...options,
   });
diff --git a/apps/ticket/src/lib/axios/utils/errorCode.ts b/apps/ticket/src/lib/axios/utils/errorCode.ts
@@ -2,6 +2,7 @@ export const ERROR_CODE = {
   LOGIN_REQUIRED: 40402,
   ACCESS_TOKEN_EXPIRED: 40103,
   REFRESH_TOKEN_EXPIRED: 40104,
+  SECURITY_ENTRY: 40106,
   NO_ACCESS_TOKEN: 40403,
   PAYMENT: 50004,
 } as const;

Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,7 @@ const SelectTicketBottomSheetContent = ({`
`250`	`250`	`// TODO: 토스트나 커스텀 모달로 변경`
`251`	`251`	`alert(error.response?.data.message);`
`252`	`252`	`}`
`253`		`-`
	`253`	`+ } finally {`
`254`	`254`	`setIsLoading(false);`
`255`	`255`	`}`
`256`	`256`	`});`