From e27265fe2bdd04640e139876411a2c1445d7bba1 Mon Sep 17 00:00:00 2001 From: Minhyung Cho Date: Fri, 6 Dec 2024 01:48:57 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix=20:=20logout=20=EC=A4=91=EB=B3=B5=20?= =?UTF-8?q?=ED=98=B8=EC=B6=9C=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/api/auth.api.ts | 15 ++------------- client/src/api/index.ts | 5 ++--- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/client/src/api/auth.api.ts b/client/src/api/auth.api.ts index d4b922f..c389945 100644 --- a/client/src/api/auth.api.ts +++ b/client/src/api/auth.api.ts @@ -25,19 +25,8 @@ instanceForAuth.interceptors.response.use( async (error: AxiosError | Error) => { if (axios.isAxiosError(error)) { logOnDev(`🚨 [API ERROR] ${error.message}`); - - if (!error.response) { - return Promise.reject(error); - } - - try { - await signOut(); - } catch (error) { - logOnDev(`🚨 [API ERROR] ${error.message}`); - } finally { - useConnectionStore.getState().logout(); - location.href = "/"; - } + useConnectionStore.getState().logout(); + location.href = "/"; return Promise.reject(error); } diff --git a/client/src/api/index.ts b/client/src/api/index.ts index b8939f2..11db478 100644 --- a/client/src/api/index.ts +++ b/client/src/api/index.ts @@ -58,13 +58,12 @@ instance.interceptors.response.use( originalRequest.headers["Authorization"] = `Bearer ${newAccessToken.accessToken}`; return instance(originalRequest); } catch (error) { - await signOut(); useConnectionStore.getState().logout(); + await signOut(); return Promise.reject(error); } } - await signOut(); - useConnectionStore.getState().logout(); + return Promise.reject(error); } From 5b9bc94911fad51b5ce11448cff165a8130d2227 Mon Sep 17 00:00:00 2001 From: Minhyung Cho Date: Fri, 6 Dec 2024 01:52:21 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix=20:=20refresh=20=EC=9E=AC=EC=9A=94?= =?UTF-8?q?=EC=B2=AD=20=EC=8B=9C=EC=97=90=EB=8F=84=20=EC=98=A4=EB=A5=98=20?= =?UTF-8?q?=EC=8B=9C=20=EB=A1=9C=EA=B7=B8=EC=95=84=EC=9B=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/api/index.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/src/api/index.ts b/client/src/api/index.ts index 11db478..aa3991a 100644 --- a/client/src/api/index.ts +++ b/client/src/api/index.ts @@ -63,7 +63,8 @@ instance.interceptors.response.use( return Promise.reject(error); } } - + useConnectionStore.getState().logout(); + await signOut(); return Promise.reject(error); }