Revert "Merge pull request #218 from PNUMeat/fix/realtime-response-recovery"

This reverts commit 858c155, reversing
changes made to 839ba58.

Author: redzzzi

.github/workflows/develop-cd.yml

@@ -27,8 +27,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
         with:
-          fetch-depth: 0
-          ref: ${{ github.head_ref || github.ref || github.event.inputs.branch || 'test' }}
+          ref: ${{ github.event.inputs.branch || github.ref_name }}
 
       - name: Set up Node.js
         uses: actions/setup-node@v3
@@ -73,8 +72,8 @@ jobs:
       - name: Invalidate CloudFront Cache
         run: |
           aws cloudfront create-invalidation \
-            --distribution-id ${{ secrets.AWS_CLOUDFRONT_ID }} \
-            --paths "/*"
+            --distribution-id ${{ secrets.CLOUDFRONT_ID }} \
+            --paths "/index.html" "/"
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

bundles.html

@@ -29,8 +29,6 @@
     "react-calendar": "^5.1.0",
     "react-dom": "^18.3.1",
     "react-hot-toast": "^2.5.2",
-    "react-icons": "^5.5.0",
-    "react-markdown": "^10.1.0",
     "react-router-dom": "^7.0.1",
     "react-slick": "^0.30.3",
     "slick-carousel": "^1.8.1"
@@ -61,7 +59,7 @@
     "vite-plugin-pwa": "^0.21.1",
     "workbox-build": "^7.3.0",
     "workbox-cacheable-response": "^7.3.0",
-    "workbox-cli": "^2.1.3",
+    "workbox-cli": "^7.3.0",
     "workbox-expiration": "^7.3.0",
     "workbox-precaching": "^7.3.0",
     "workbox-routing": "^7.3.0",

package-lock.json

@@ -1,6 +1,7 @@
+import { handleCookieOnRedirect } from '@/utils/cookie';
+
 import { NavigateFunction } from 'react-router-dom';
 
-import { API_BASE_URL } from '@/api/config';
 import { ServerIntendedError } from '@/api/types';
 import { PATH } from '@/routes/path';
 import axios, {
@@ -27,7 +28,7 @@ const processQueue = (error: AxiosError | null): void => {
     if (error) {
       prom.reject(error);
     } else {
-      prom.resolve(apiInstance(prom.config));
+      prom.resolve(axios(prom.config));
     }
   });
 
@@ -45,8 +46,7 @@ export const navigate = (path: string) => {
 };
 
 const apiInstance: AxiosInstance = axios.create({
-  baseURL: `${API_BASE_URL}/api/`,
-  withCredentials: true,
+  baseURL: `/api/`,
   headers: {
     'Content-Type': 'application/json',
   },
@@ -55,9 +55,9 @@ const apiInstance: AxiosInstance = axios.create({
 
 apiInstance.interceptors.request.use(
   (config) => {
-    // 헤더가 남아있을 경우 삭제
-    if (config.headers?.Authorization) {
-      delete config.headers.Authorization;
+    const token = sessionStorage.getItem('Authorization');
+    if (token) {
+      config.headers.Authorization = `Bearer ${token}`;
     }
     return config;
   },
@@ -92,6 +92,7 @@ apiInstance.interceptors.response.use(
       if (error.response.status === 401) {
         if (code === 100) {
           navigate(PATH.ENROLL);
+
           return Promise.reject(error);
         }
 
@@ -111,12 +112,15 @@ apiInstance.interceptors.response.use(
           return apiInstance
             .post('v1/reissue')
             .then(() => {
+              handleCookieOnRedirect();
+
               processQueue(null);
               return apiInstance(originalRequest);
             })
             .catch((reissueError: AxiosError) => {
               processQueue(reissueError);
-              // navigate(PATH.LOGIN);
+              sessionStorage.removeItem('Authorization');
+              navigate(PATH.LOGIN);
 
               console.error('reissue error', reissueError);
               return Promise.reject(reissueError);
@@ -128,6 +132,7 @@ apiInstance.interceptors.response.use(
 
         // 리프레시 토큰이 만료됨
         // sessionStorage.removeItem('Authorization');
+        // navigate(PATH.LOGIN);
         return Promise.reject(error);
       }
     }

package.json

@@ -1,3 +1,7 @@
+import { isDevMode } from '@/utils/cookie.ts';
+
+import { subjectMock, teamArticlesMock, teamInfoMock } from '@/api/mocks.ts';
+
 import apiInstance from './apiInstance';
 import { ITeamInfo } from './team';
 import { ServerResponse } from './types';
@@ -28,31 +32,12 @@ export interface IArticle {
 
 export interface IArticlesByDateResponse {
   content: IArticle[];
-  empty: boolean;
-  first: boolean;
-  last: boolean;
-  number: number;
-  numberOfElements: number;
-  pageable: {
-    offset: number;
-    pageNumber: number;
-    pageSize: number;
-    paged: boolean;
-    unpaged: boolean;
-    sort: {
-      empty: boolean;
-      sorted: boolean;
-      unsorted: boolean;
-    };
+  page: {
+    size: number;
+    number: number;
+    totalElements: number;
+    totalPages: number;
   };
-  size: number;
-  sort: {
-    empty: boolean;
-    sorted: boolean;
-    unsorted: boolean;
-  };
-  totalElements: number;
-  totalPages: number;
 }
 
 export interface ITopicResponse {
@@ -73,6 +58,12 @@ export const getTeamInfoAndTags = async (
   year: number,
   month: number
 ): Promise<ITeamInfoAndTagsResponse> => {
+  if (isDevMode()) {
+    await new Promise((r) => setTimeout(r, 1000));
+
+    return teamInfoMock.data;
+  }
+
   const res = await apiInstance.get<ServerResponse<ITeamInfoAndTagsResponse>>(
     `/v1/teams/${teamId}/team-page`,
     { params: { year, month } }
@@ -86,6 +77,10 @@ export const getArticlesByDate = async (
   date: string,
   page: number
 ): Promise<IArticlesByDateResponse> => {
+  if (isDevMode()) {
+    return teamArticlesMock.data;
+  }
+
   const res = await apiInstance.get<ServerResponse<IArticlesByDateResponse>>(
     `/v1/articles/${teamId}/by-date`,
     { params: { date, page } }
@@ -98,6 +93,10 @@ export const getTeamTopic = async (
   teamId: number,
   date: string
 ): Promise<ITopicResponse> => {
+  if (isDevMode()) {
+    return subjectMock.data;
+  }
+
   const res = await apiInstance.get<ServerResponse<ITopicResponse>>(
     `/v1/articles/teams/${teamId}/subjects`,
     { params: { date } }

src/App.tsx

@@ -1,4 +1,7 @@
+import { isDevMode } from '@/utils/cookie.ts';
+
 import apiInstance from '@/api/apiInstance';
+import { myArticlesMock, myPageTeamMock } from '@/api/mocks.ts';
 import { ServerResponse } from '@/api/types';
 
 export type TeamAbstraction = {
@@ -9,9 +12,9 @@ export type TeamAbstraction = {
 };
 
 export const queryMyTeamInfo = async () => {
-  // if (isDevMode()) {
-  //   return myPageTeamMock.data;
-  // }
+  if (isDevMode()) {
+    return myPageTeamMock.data;
+  }
 
   const res =
     await apiInstance.get<ServerResponse<TeamAbstraction[]>>(
@@ -46,9 +49,9 @@ export type MyArticleResponse = {
 };
 
 export const queryMyArticles = async (teamId: number, page: number) => {
-  // if (isDevMode()) {
-  //   return myArticlesMock.data;
-  // }
+  if (isDevMode()) {
+    return myArticlesMock.data;
+  }
 
   const res = await apiInstance.get<ServerResponse<MyArticleResponse>>(
     `v1/articles/${teamId}/my-page`,