fix: 로그인 reissue 로직 수정

- reissue 401에러 시에 진행 안되는 문제 해결

Author: nirii00

src/apis/auth.ts

@@ -63,10 +63,15 @@ export const deleteUserInfo = async () => {
 
 export const postLogout = async () => {
   try {
+    console.log(' before logout');
+
     const response = await client.post('/api/logout', { withCredentials: true });
+    console.log('logout', response);
     if (!response) throw new Error('postLogout: failed to logout');
     return response;
   } catch (error) {
+    console.log('logout error');
+
     console.error(error);
   }
 };

src/apis/client.ts

@@ -9,27 +9,27 @@ const client = axios.create({
   headers: { 'Content-Type': 'application/json' },
 });
 
-type FailedRequest = {
-  resolve: (token: string) => void;
-  reject: (error: unknown) => void;
-};
+// type FailedRequest = {
+//   resolve: (token: string) => void;
+//   reject: (error: unknown) => void;
+// };
 
 let isRefreshing = false;
-let failedQueue: FailedRequest[] = [];
-
-const processQueue = (error: unknown, token: string | null = null) => {
-  failedQueue.forEach((prom) => {
-    if (error) {
-      prom.reject(error);
-    } else {
-      if (token) {
-        prom.resolve(token);
-      }
-    }
-  });
-
-  failedQueue = [];
-};
+// let failedQueue: FailedRequest[] = [];
+
+// const processQueue = (error: unknown, token: string | null = null) => {
+//   failedQueue.forEach((prom) => {
+//     if (error) {
+//       prom.reject(error);
+//     } else {
+//       if (token) {
+//         prom.resolve(token);
+//       }
+//     }
+//   });
+
+//   failedQueue = [];
+// };
 
 const callReissue = async () => {
   try {
@@ -41,6 +41,7 @@ const callReissue = async () => {
   }
 };
 
+let retry = false;
 client.interceptors.request.use(
   (config) => {
     console.log('response again', config);
@@ -68,40 +69,34 @@ client.interceptors.response.use(
       return Promise.reject(error);
     }
 
-    if (
-      (error.response?.status === 401 || error.response?.status === 403) &&
-      !originalRequest._retry
-    ) {
-      originalRequest._retry = true;
-
+    if ((error.response?.status === 401 || error.response?.status === 403) && !retry) {
       if (isRefreshing) {
-        console.log('request', originalRequest);
-        console.log('isRefreshing');
-        console.log('failedQueue', failedQueue);
-        try {
-          return new Promise((resolve, reject) => {
-            failedQueue.push({
-              resolve: (token: string) => {
-                originalRequest.headers.Authorization = `Bearer ${token}`;
-                resolve(client(originalRequest));
-              },
-              reject: (err: unknown) => reject(err),
-            });
-          });
-        } catch (e) {
-          return Promise.reject(e);
-        }
+        retry = true;
+        if (isLoggedIn) logout();
+        // try {
+        //   return new Promise((resolve, reject) => {
+        //     failedQueue.push({
+        //       resolve: (token: string) => {
+        //         originalRequest.headers.Authorization = `Bearer ${token}`;
+        //         resolve(client(originalRequest));
+        //       },
+        //       reject: (err: unknown) => reject(err),
+        //     });
+        //   });
+        // } catch (e) {
+        //   return Promise.reject(e);
+        // }
       } else {
         isRefreshing = true;
         try {
           const newToken = await callReissue();
           setAccessToken(newToken);
-          processQueue(null, newToken);
+          // processQueue(null, newToken);
           isRefreshing = false;
           originalRequest.headers.Authorization = `Bearer ${newToken}`;
           return client(originalRequest);
         } catch (e) {
-          processQueue(e, null);
+          // processQueue(e, null);
           isRefreshing = false;
           if (isLoggedIn) logout();
           return Promise.reject(e);

src/stores/authStore.ts

@@ -1,7 +1,7 @@
 import { create } from 'zustand';
 import { persist, createJSONStorage } from 'zustand/middleware';
 
-import { postLogout } from '@/apis/auth';
+// import { postLogout } from '@/apis/auth';
 
 interface AuthStore {
   isLoggedIn: boolean;
@@ -21,12 +21,13 @@ const useAuthStore = create(
       zipCode: '',
       login: () => set({ isLoggedIn: true }),
       logout: async () => {
-        try {
-          await postLogout();
-        } catch (e) {
-          console.error(e);
-        }
         set({ isLoggedIn: false, zipCode: '', accessToken: '' });
+        // location.reload();
+        // try {
+        //   await postLogout();
+        // } catch (e) {
+        //   console.error(e);
+        // }
       },
       setZipCode: (zipCode) => set({ zipCode: zipCode }),
       setAccessToken: (accessToken) => set({ accessToken: accessToken }),