From adf3dfab9a67e929b8527a8d74524d53e180ba7d Mon Sep 17 00:00:00 2001
From: llddang <bodyness@naver.com>
Date: Thu, 12 Sep 2024 16:20:31 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20page=20=ED=8F=B4=EB=8D=94=20=EB=B0=94?=
 =?UTF-8?q?=EA=B9=A5=EC=97=90=EC=84=9C=20next/header=20=EC=82=AC=EC=9A=A9?=
 =?UTF-8?q?=ED=95=A0=20=EC=88=98=20=EC=97=86=EC=96=B4=EC=84=9C=20=EC=A7=81?=
 =?UTF-8?q?=EC=A0=91=20token=20=EB=84=A3=EC=96=B4=EC=A3=BC=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#186
---
 .../src/app/admin/milestone/list/[slug]/page.tsx    |  5 ++++-
 frontend/src/app/admin/milestone/list/page.tsx      |  6 +++++-
 frontend/src/lib/api/server.api.ts                  | 13 ++++++++++---
 frontend/src/lib/api/server.axios.ts                | 10 ----------
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/frontend/src/app/admin/milestone/list/[slug]/page.tsx b/frontend/src/app/admin/milestone/list/[slug]/page.tsx
index cd6ebbe6..65d3073b 100644
--- a/frontend/src/app/admin/milestone/list/[slug]/page.tsx
+++ b/frontend/src/app/admin/milestone/list/[slug]/page.tsx
@@ -8,6 +8,8 @@ import { convertMilestoneHistoryStatus } from '@/lib/utils/utils';
 import FilePreview from './components/FilePreview';
 import MilestoneHistoryStatusChangeButton from './components/MilestoneHistoryStatusChangeButton';
 import { notFound } from 'next/navigation';
+import { AuthSliceState } from '@/store/auth.slice';
+import { getAuthFromCookie } from '@/lib/utils/auth';
 
 interface MilestoneHistoryDetailPageProps {
   params: {
@@ -16,9 +18,10 @@ interface MilestoneHistoryDetailPageProps {
 }
 
 const Page = async ({ params: { slug } }: MilestoneHistoryDetailPageProps) => {
+  const auth: AuthSliceState = getAuthFromCookie();
   let history;
   try {
-    history = await getMilestoneHistory(slug);
+    history = await getMilestoneHistory(slug, auth.token);
   } catch (e) {
     // TODO: server api error handling...
   }
diff --git a/frontend/src/app/admin/milestone/list/page.tsx b/frontend/src/app/admin/milestone/list/page.tsx
index b07d1af8..af521a30 100644
--- a/frontend/src/app/admin/milestone/list/page.tsx
+++ b/frontend/src/app/admin/milestone/list/page.tsx
@@ -8,16 +8,20 @@ import { getMilestoneHistories } from '@/lib/api/server.api';
 
 import MilestoneHistoryTable from './components/MilestoneHistoryTable';
 import MilestoneHistoryExcelFileDownloadButton from './components/MilestoneHistoryTable/MilestoneHistoryExcelFileDownloadButton.tsx';
+import { AuthSliceState } from '@/store/auth.slice';
+import { getAuthFromCookie } from '@/lib/utils/auth';
 
 const Page = async ({ searchParams }: { searchParams?: { [key: string]: string | undefined } }) => {
   const headersList = headers();
   const pathname = headersList.get('x-pathname') || '';
 
+  const auth: AuthSliceState = getAuthFromCookie();
+
   const page = searchParams?.page ? parseInt(searchParams.page, 10) : 1;
   const field = searchParams?.field ? parseInt(searchParams.field, 10) : 0;
   const keyword = searchParams?.keyword ? searchParams.keyword : '';
 
-  const milestoneHistories = await getMilestoneHistories(field, keyword, page - 1);
+  const milestoneHistories = await getMilestoneHistories(auth.token, field, keyword, page - 1);
 
   return (
     <div>
diff --git a/frontend/src/lib/api/server.api.ts b/frontend/src/lib/api/server.api.ts
index c11d309a..771d5e74 100644
--- a/frontend/src/lib/api/server.api.ts
+++ b/frontend/src/lib/api/server.api.ts
@@ -40,9 +40,16 @@ export async function getMilestoneHistoriesOfStudent(
     .catch((err) => Promise.reject(err));
 }
 
-export async function getMilestoneHistories(field?: number, keyword?: string, page: number = 0, size: number = 10) {
+export async function getMilestoneHistories(
+  token: string,
+  field?: number,
+  keyword?: string,
+  page: number = 0,
+  size: number = 10,
+) {
   return await server
     .get<MilestoneHistoryPageableDto>('/admin/milestones/histories', {
+      headers: { Authorization: token },
       params: removeEmptyField({
         field,
         keyword,
@@ -54,9 +61,9 @@ export async function getMilestoneHistories(field?: number, keyword?: string, pa
     .catch((err) => Promise.reject(err));
 }
 
-export async function getMilestoneHistory(historyId: number) {
+export async function getMilestoneHistory(historyId: number, token: string) {
   return await server
-    .get<MilestoneHistoryDto>(`/admin/milestones/histories/${historyId}`)
+    .get<MilestoneHistoryDto>(`/admin/milestones/histories/${historyId}`, { headers: { Authorization: token } })
     .then((res) => res.data)
     .catch((err) => Promise.reject(err));
 }
diff --git a/frontend/src/lib/api/server.axios.ts b/frontend/src/lib/api/server.axios.ts
index ac7d950d..306964b5 100644
--- a/frontend/src/lib/api/server.axios.ts
+++ b/frontend/src/lib/api/server.axios.ts
@@ -1,19 +1,9 @@
 import axios from 'axios';
 
 import { categorizeError } from '@/types/error';
-import { AuthSliceState } from '@/store/auth.slice';
-import { getAuthFromCookie } from '../utils/auth';
 
 export const server = axios.create({ baseURL: process.env.NEXT_PUBLIC_SERVER_URL, withCredentials: true });
 
-server.interceptors.request.use((config) => {
-  const auth: AuthSliceState = getAuthFromCookie();
-  if (auth.token) {
-    config.headers.Authorization = `Bearer ${auth.token}`;
-  }
-  return config;
-});
-
 server.interceptors.response.use(
   (response) => response,
   (error) => Promise.reject(categorizeError(error)),