Merge pull request #114 from JNU-econovation/feat/8-switch-cookie

리다이렉트문 수정
JNU-econovation · Mar 3, 2024 · d7d91a0 · d7d91a0
2 parents bf264af + 93bb5b6
commit d7d91a0
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 61 deletions.
diff --git a/frontend/app/(WithNavbar)/admin/page.tsx b/frontend/app/(WithNavbar)/admin/page.tsx
diff --git a/frontend/app/(WithNavbar)/applicant/page.tsx b/frontend/app/(WithNavbar)/applicant/page.tsx
diff --git a/frontend/app/(WithNavbar)/interview/page.tsx b/frontend/app/(WithNavbar)/interview/page.tsx
diff --git a/frontend/app/(WithNavbar)/kanban/page.tsx b/frontend/app/(WithNavbar)/kanban/page.tsx
diff --git a/frontend/app/(WithNavbar)/layout.tsx b/frontend/app/(WithNavbar)/layout.tsx
@@ -1,5 +1,4 @@
 import CommonNavbar from "@/components/common/navbar/Navbar";
-import Validate from "@/components/user/Validate.component";
 import { PropsWithChildren } from "react";
 import { headers } from "next/headers";
 
@@ -13,7 +12,6 @@ const ApplicantPage = ({ children }: WithNavbarLayout) => {
 
   return (
     <div className="px-24 min-w-[1280px] flex p-12">
-      <Validate />
       <CommonNavbar
         generation={generation}
         currentPath={currentPath}

diff --git a/frontend/app/kanban/[generation]/detail/page.tsx b/frontend/app/kanban/[generation]/detail/page.tsx
@@ -2,7 +2,6 @@
 
 import KanbanColumnDetailCard from "@/components/kanban/column/ColumnWithBackButton.component";
 import KanbanDetailApplicant from "@/components/kanban/content/DetailApplicant.component";
-import Validate from "@/components/user/Validate.component";
 import { KanbanCardReq } from "@/src/apis/kanban";
 import KanbanDetailWork from "@/components/kanban/content/DetailWork.component";
 
@@ -52,7 +51,6 @@ const KanbanBoardDetailPage = ({
 }: KanbanBoardDetailPageProps) => {
   return (
     <main className="flex mt-8 overflow-auto pt-12 pl-12">
-      <Validate />
       <KanbanColumnDetailCard
         columnIndex={+columnIndex ?? 0}
         generation={generation}

diff --git a/frontend/app/page.tsx b/frontend/app/page.tsx
@@ -1,6 +1,5 @@
 import Txt from "@/components/common/Txt.component";
 import HomeCardComponent from "@/components/main/Card.component";
-import Validate from "@/components/user/Validate.component";
 import { MAIN_MENU, CURRENT_GENERATION } from "@/src/constants";
 
 const HomePage = () => {
@@ -13,7 +12,6 @@ const HomePage = () => {
 
   return (
     <main className="flex justify-between">
-      <Validate />
       <div className="pt-24 pl-16 flex flex-col gap-2">
         <Txt typography="head" className="font-semibold uppercase">
           econovation

diff --git a/frontend/components/application/applicationNode/NextButton.component.tsx b/frontend/components/application/applicationNode/NextButton.component.tsx
@@ -34,7 +34,8 @@ const canNext = (applicationNames: Array<string>) => {
     }
     return (
       !(localStorageValueFromName.length === 0) ||
-      (name === "channel" && localStorage.get("channelEtc", EMPTY_STRING).length !== 0)
+      (name === "channel" &&
+        localStorage.get("channelEtc", EMPTY_STRING).length !== 0)
     );
   });
 };

diff --git a/frontend/components/user/Validate.component.tsx b/frontend/components/user/Validate.component.tsx
diff --git a/frontend/middleware.ts b/frontend/middleware.ts
@@ -1,9 +1,19 @@
-import { NextResponse } from "next/server";
+import { NextRequest, NextResponse } from "next/server";
+import { CURRENT_GENERATION, needValidatePath } from "./src/constants";
 
-export function middleware(request: Request) {
+export function middleware(request: NextRequest) {
   const requestHeaders = new Headers(request.headers);
   requestHeaders.set("x-url", request.url);
 
+  const redirectUrl = (url: string) => {
+    return NextResponse.redirect(new URL(url, request.url));
+  };
+
+  const isRedirectPath = needValidatePath.includes(request.nextUrl.pathname);
+
+  if (isRedirectPath)
+    return redirectUrl(`${request.nextUrl.pathname}/${CURRENT_GENERATION}`);
+
   return NextResponse.next({
     request: {
       headers: requestHeaders,

diff --git a/frontend/src/apis/user/index.ts b/frontend/src/apis/user/index.ts
@@ -1,5 +1,4 @@
 import { https } from "@/src/functions/axios";
-import { localStorage } from "@/src/functions/localstorage";
 
 interface SignInReq {
   email: string;
@@ -18,8 +17,6 @@ export const signIn = async ({ email, password }: SignInReq) => {
       alert("로그인이 성공하였습니다");
     }
 
-    localStorage.set("accessToken", data.accessToken);
-    localStorage.set("refreshToken", data.refreshToken);
     return true;
   } catch (error) {
     return false;

diff --git a/frontend/src/constants/index.ts b/frontend/src/constants/index.ts
@@ -162,3 +162,10 @@ export const ORDER_MENU = {
     { type: "score", string: "점수순" },
   ],
 } as const;
+
+export const needValidatePath = [
+  "/admin",
+  "/applicant",
+  "/interview",
+  "/kanban",
+];
diff --git a/frontend/src/functions/axios.ts b/frontend/src/functions/axios.ts
@@ -4,6 +4,8 @@ const https = axios.create({
   baseURL: process.env.NEXT_PUBLIC_API_URL,
 });
 
+https.defaults.withCredentials = true;
+
 https.interceptors.request.use((config) => {
   const token = JSON.parse(localStorage.getItem("accessToken") ?? '""');
   if (token) {
@@ -20,8 +22,6 @@ https.interceptors.response.use(
   },
   (error) => {
     if (error.response.status === 401 || error.response.status === 403) {
-      localStorage.removeItem("accessToken");
-      localStorage.removeItem("refreshToken");
       alert("로그인이 필요합니다.");
       window.location.href = "/signin";
     }