Merge pull request #156 from PLADI-ALM/feat/PDW-76-car-booking

[PDW-76/fix] 로그아웃 수정
PLADI-ALM · Dec 5, 2023 · 82f9d72 · 82f9d72
2 parents a1dde94 + e8817b8
commit 82f9d72
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/src/pages/admin/office/OfficeManageAdd.js b/src/pages/admin/office/OfficeManageAdd.js
@@ -339,7 +339,7 @@ function OfficeManageAdd(props) {
         }
     }, [])
 
-    // 책임자 리스트 검색
+    // 시설 리스트 검색
     const getFacilityList = () => {
         AdminOfficesAxios.get(`facilities?name=${searchWord}`, {
             headers: {

diff --git a/src/pages/basic/booking/office/SelectOffice.js b/src/pages/basic/booking/office/SelectOffice.js
@@ -50,7 +50,7 @@ function SelectOffice(props) {
     const searchOffice = () => {
         let url = `?facilityName=${facilityName.current}`
         if (date !== "")
-            url = `?facilityName=${facilityName.current}&date=${date}&startTime=${startTime}&endTime=${endTime}`
+            url = `?facilityName=${facilityName.current}&date=${date}&startTime=${startTime}&endTime=${endTime}&size=200`
         OfficesAxios.get(url, {
             headers: {
                 Authorization: getToken()

diff --git a/src/utils/CookiesUtil.js b/src/utils/CookiesUtil.js
@@ -20,4 +20,6 @@ export const removeAllCookies = () => {
     Object.keys(cookieKeys).forEach(key => {
         cookies.remove(key)
     })
+
+    window.location.replace('/')
 }
diff --git a/src/utils/ErrorHandlerUtil.js b/src/utils/ErrorHandlerUtil.js
@@ -1,4 +1,5 @@
 import { removeTokenAndNavigate, isLogin } from "utils/IsLoginUtil"
+import {removeAllCookies} from "./CookiesUtil";
 
 // 일반 예외처리
 export function basicError(error) {
@@ -12,8 +13,7 @@ export function basicError(error) {
 
             // 토큰에러인 경우 쿠키 삭제 (토큰 에러를 두번 alert 하지 않기 위해 토큰 존재 여부 판단)
             if (String(error.response.data.code).startsWith('T')) {
-                alert(errMsg)
-                removeTokenAndNavigate()
+                removeAllCookies()
             }
         } else {
             console.log(error)
@@ -37,8 +37,7 @@ export function notLogInError(error) {
 
             // 토큰에러인 경우 쿠키 삭제 (토큰 에러를 두번 alert 하지 않기 위해 토큰 존재 여부 판단)
             if (String(error.response.data.code).startsWith('T') && isLogin()) {
-                alert(errMsg)
-                removeTokenAndNavigate()
+                removeAllCookies()
             }
         } else {
             console.log(error)