From 9dcc2e6f4272590664fc6b0cca73779aa6e84467 Mon Sep 17 00:00:00 2001 From: prgmr99 Date: Wed, 7 May 2025 13:27:19 +0900 Subject: [PATCH 1/2] =?UTF-8?q?chore:=20=EB=A6=AC=EB=8B=A4=EC=9D=B4?= =?UTF-8?q?=EB=A0=89=ED=8A=B8=20=EC=A1=B0=EA=B1=B4=20=EA=B5=AC=EC=B2=B4?= =?UTF-8?q?=ED=99=94=20=EB=B0=8F=20runtime=20=EC=98=B5=EC=85=98=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/middleware.ts | 55 ++--------------------------------------------- 1 file changed, 2 insertions(+), 53 deletions(-) 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"; From b9345aecb0f244f896a405e689e41bef39a25f8d Mon Sep 17 00:00:00 2001 From: prgmr99 Date: Wed, 7 May 2025 13:28:49 +0900 Subject: [PATCH 2/2] =?UTF-8?q?chore:=20=EC=84=A4=EC=A0=95=20=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EA=B3=B5=ED=86=B5=20=EC=BB=B4=ED=8F=AC?= =?UTF-8?q?=EB=84=8C=ED=8A=B8=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/(protected)/my-page/setting/page.tsx | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) 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 (
{/* 헤더 부분 */} -
- - 뒤로가기 - -
- 설정 -
-
+
서비스 관리