Skip to content

chore: middleware 리다이렉트 조건 수정 #180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
prgmr99 merged 2 commits into from
May 7, 2025
Merged

chore: middleware 리다이렉트 조건 수정 #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9dcc2e6
chore: 리다이렉트 조건 구체화 및 runtime 옵션 제거
prgmr99 May 7, 2025
b9345ae
chore: 설정 페이지 공통 컴포넌트 적용
prgmr99 May 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions src/app/(protected)/my-page/setting/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down Expand Up @@ -98,14 +99,7 @@ export default function MyPage() {
return (
<div className="flex flex-col">
{/* 헤더 부분 */}
<div className="z-20 fixed top-0 w-[100vw] flex items-center justify-between px-5 py-[14px] bg-background-primary pt-[60px]">
<Link href="/my-page">
<Image src={ArrowLeft} alt="뒤로가기" width={24} height={24} />
</Link>
<div className="s2 mr-[18px] w-full text-center text-gray-normal">
설정
</div>
</div>
<CustomBackHeader title="설정" backRoute="/my-page" />

<div className="px-5 mt-[65px]">
<div className="l5 text-gray-alternative">서비스 관리</div>
Expand Down
55 changes: 2 additions & 53 deletions src/middleware.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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");
Expand All @@ -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));
}

Expand All @@ -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";