Merge branch 'main' into 6-feat-meeting-page-상단바-생성

Author: Eunjin03

src/api/common/common.ts

@@ -0,0 +1,17 @@
+import Send from "@/api/send.ts";
+import { searchParams } from "@/types/searchParams";
+
+export const getTest = () => {
+  return Send({
+    method: "get",
+    url: "main/apiTest",
+  });
+};
+
+export const getSearch = (params: searchParams) => {
+  return Send({
+    method: "get",
+    url: "main/search",
+    params: params,
+  });
+};

src/api/main/profile.ts

@@ -0,0 +1,8 @@
+import Send from "@/api/send.ts";
+
+export const getProfile = () => {
+  return Send({
+    method: "get",
+    url: "main/profile",
+  });
+};

src/api/main/project.ts

@@ -1,19 +1,10 @@
 import Send from "@/api/send.ts";
 import { selectParams } from "@/types/selectParams";
 
-export const getTest = () => {
-  return Send({
-    method: "get",
-    url: "main/apiTest",
-    withCredentials: true,
-  });
-};
-
 export const getProject = (params: selectParams) => {
   return Send({
     method: "get",
     url: "main",
     params: params,
-    withCredentials: true,
   });
 };

src/api/send.ts

@@ -25,17 +25,19 @@ instance.interceptors.response.use(
     const originalRequest = error.config;
 
     // accessToken 만료 (예: 401)
-    if (error.response?.status === 503 && !originalRequest._retry) {
+    if (error.response?.status === 401 && error.response?.data.message === 'AUTH_002' && !originalRequest._retry) {
       originalRequest._retry = true;
+
       try {
-        const res = await axios.post(`${import.meta.env.VITE_API_SERVER_URL}/auth/refresh`, {
+        const res = await axios.post(`${import.meta.env.VITE_API_SERVER_URL}auth/refresh`, {
           refreshToken: getRefreshToken(),
         });
-        const { accessToken, refreshToken } = res.data;
+        const { accessToken, refreshToken } = res.data.data;
         setTokens(accessToken, refreshToken);
         originalRequest.headers.Authorization = `Bearer ${accessToken}`;
         return instance(originalRequest);
       } catch (e) {
+        alert('로그인이 만료되었습니다.')
         clearTokens();
         window.location.href = "/";
         return Promise.reject(e);

src/api/splash/login.ts

@@ -9,3 +9,19 @@ export const postLogin = (loginData: LoginData) => {
     withCredentials: true,
   });
 };
+
+export const refresh = (data:any) => {
+  return Send({
+    method: "post",
+    url: "auth/refresh",
+    data: data,
+    withCredentials: true,
+  });
+};
+
+export const logout = () => {
+  return Send({
+    method: "delete",
+    url: "auth/logout"
+  });
+};

src/assets/imgs/common/test.png

@@ -1,7 +1,7 @@
 import { BrowserRouter, Route, Routes } from "react-router-dom";
 
 import ProjectPage from "@/views/main/page/ProjectPage";
-import SplashPage from "@/views/splash/page/SplashPage";
+import SplashRedirect from "./SplashRedirect";
 import RecordPage from "@/views/main/page/RecordPage";
 import SummaryPage from "@/views/main/page/SummaryPage";
 import MeetingPage from "@/views/meeting/page/MeetingPage";
@@ -44,6 +44,7 @@ const Router = () => {
             </ProtectedRoute>
           }
         />
+
       </Routes>
     </BrowserRouter>
   );

src/assets/imgs/common/user.svg

@@ -0,0 +1,12 @@
+import { Navigate } from "react-router-dom";
+import { isLoggedIn } from "@/utils/auth";
+import SplashPage from "@/views/splash/page/SplashPage";
+
+const SplashRedirect = () => {
+  if (isLoggedIn()) {
+    return <Navigate to="/project" replace />;
+  }
+  return <SplashPage />;
+};
+
+export default SplashRedirect;

src/routes/Routes.tsx

@@ -0,0 +1,8 @@
+export interface profileData {
+  memberId: number;
+  name: string;
+  email: string;
+  imageUrl: string;
+  time: string;
+  date: string;
+}