diff --git a/src/app/(protected)/my-page/setting/page.tsx b/src/app/(protected)/my-page/setting/page.tsx index d8819715..20e29488 100644 --- a/src/app/(protected)/my-page/setting/page.tsx +++ b/src/app/(protected)/my-page/setting/page.tsx @@ -9,6 +9,7 @@ import Link from "next/link"; import { useRouter } from "next/navigation"; import { useState } from "react"; +import CustomBackHeader from "@/components/customBackHeader/CustomBackHeader"; import ArrowLeft from "@public/icons/common/ArrowLeft.svg"; import ExternalLink from "@public/icons/mypage/external-link.svg"; @@ -98,14 +99,7 @@ export default function MyPage() { return (
{/* 헤더 부분 */} -
- - 뒤로가기 - -
- 설정 -
-
+
서비스 관리
diff --git a/src/middleware.ts b/src/middleware.ts index b6a4b447..c37e266e 100644 --- a/src/middleware.ts +++ b/src/middleware.ts @@ -1,7 +1,5 @@ import { type NextRequest, NextResponse } from "next/server"; -const REFRESH_ENDPOINT = "/v1/auth/token/refresh"; - export async function middleware(request: NextRequest) { const path = request.nextUrl.pathname; const accessToken = request.cookies.get("accessToken"); @@ -18,58 +16,11 @@ export async function middleware(request: NextRequest) { (openPath) => path === openPath || path.startsWith(`${openPath}/`), ); - if (!isOpenPath && !refreshToken) { + if (!isOpenPath && (!refreshToken || !refreshToken.value)) { return NextResponse.redirect(new URL("/login", request.url), 302); } - // if (!isOpenPath && !accessToken && refreshToken) { - // const cookieStore = request.cookies; - // const oldRefreshToken = cookieStore.get("refreshToken")?.value; - - // const response = await fetch( - // `${process.env.NEXT_PUBLIC_API_URL}${REFRESH_ENDPOINT}`, - // { - // method: "POST", - // headers: { "Content-Type": "application/json" }, - // body: JSON.stringify({ refreshToken: oldRefreshToken }), - // }, - // ); - - // if (!response.ok) { - // const resp = NextResponse.redirect(new URL("/login", request.url), 307); - // resp.cookies.delete("accessToken"); - // resp.cookies.delete("refreshToken"); - // return resp; - // } - - // const { accessToken, refreshToken: newRefreshToken } = - // (await response.json()) as { - // accessToken: string; - // refreshToken: string; - // }; - - // const nextResponse = NextResponse.next(); - - // nextResponse.cookies.set("accessToken", accessToken, { - // httpOnly: true, - // secure: true, - // sameSite: "none", - // path: "/", - // maxAge: 60 * 60, - // }); - - // nextResponse.cookies.set("refreshToken", newRefreshToken, { - // httpOnly: true, - // secure: true, - // sameSite: "none", - // path: "/", - // maxAge: 60 * 60 * 24 * 7, - // }); - - // return nextResponse; - // } - - if (isOpenPath && accessToken) { + if (isOpenPath && accessToken && accessToken.value) { return NextResponse.redirect(new URL("/", request.url)); } @@ -79,5 +30,3 @@ export async function middleware(request: NextRequest) { export const config = { matcher: ["/((?!api|_next/static|_next/image|favicon.ico|icons|public).*)"], }; - -export const runtime = "nodejs";