From dc377d7cd0cdd14bb021537be20f51f20cd0d150 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Fri, 24 May 2024 14:00:23 +0900 Subject: [PATCH] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=8B=A4?= =?UTF-8?q?=ED=8C=A8=20=EC=95=88=EB=82=B4=EB=A9=94=EC=8B=9C=EC=A7=80=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95.=20=EA=B4=80=EB=A6=AC?= =?UTF-8?q?=EC=9E=90=EB=A9=94=EB=89=B4=20>=20=EC=82=AC=EC=9A=A9=EC=9E=90?= =?UTF-8?q?=20=EB=AA=A9=EB=A1=9D=20=EC=82=AC=EC=9A=A9=EC=9E=90=20=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=88=98=EC=A0=95=EC=8B=9C=20=ED=81=AC=EB=A1=AC?= =?UTF-8?q?=EC=97=90=20=EC=A0=80=EC=9E=A5=EB=90=9C=20=EB=B9=84=EB=B0=80?= =?UTF-8?q?=EB=B2=88=ED=98=B8=20=EC=9E=90=EB=8F=99=EC=9E=85=EB=A0=A5=20?= =?UTF-8?q?=ED=95=B4=EC=A0=9C.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/egovFetch.js | 8 +++- .../src/pages/admin/users/UserInfoModal.jsx | 2 +- .../src/pages/login/EgovLoginContent.jsx | 40 ++++++++++--------- 3 files changed, 28 insertions(+), 22 deletions(-) diff --git a/egovframe-template-simple-react-contribution/src/api/egovFetch.js b/egovframe-template-simple-react-contribution/src/api/egovFetch.js index 4ed6da9..37bfddb 100644 --- a/egovframe-template-simple-react-contribution/src/api/egovFetch.js +++ b/egovframe-template-simple-react-contribution/src/api/egovFetch.js @@ -56,8 +56,12 @@ export function requestFetch(url, requestOptions, handler, errorHandler) { }) .then((resp) => { if (Number(resp.resultCode) === Number(CODE.RCV_ERROR_AUTH)) { - alert("로그인이 해제되었습니다.") - window.location.href = "/login" + if(url === "/auth/login"){ + alert("로그인을 실패하였습니다.") + }else{ + alert("로그인이 해제되었습니다.") + window.location.href = "/login" + } }else{ return resp; } diff --git a/egovframe-template-simple-react-contribution/src/pages/admin/users/UserInfoModal.jsx b/egovframe-template-simple-react-contribution/src/pages/admin/users/UserInfoModal.jsx index c741900..2b676f8 100644 --- a/egovframe-template-simple-react-contribution/src/pages/admin/users/UserInfoModal.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/admin/users/UserInfoModal.jsx @@ -103,7 +103,7 @@ function UserInfoModal({savedInfo, cmtList, reloadFunction}){ 비밀번호 - + diff --git a/egovframe-template-simple-react-contribution/src/pages/login/EgovLoginContent.jsx b/egovframe-template-simple-react-contribution/src/pages/login/EgovLoginContent.jsx index b28bbcd..86b35fb 100644 --- a/egovframe-template-simple-react-contribution/src/pages/login/EgovLoginContent.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/login/EgovLoginContent.jsx @@ -82,27 +82,29 @@ function EgovLoginContent(props) { EgovNet.requestFetch(loginUrl, requestOptions, (resp) => { - if (Number(resp.resultCode) === Number(CODE.RCV_SUCCESS)) { - let accessToken = resp?.accessToken || null; - let resultVO = parseJwt(accessToken); - let refreshToken = resp?.refreshToken || null; + if(resp !== undefined){ + if (Number(resp.resultCode) === Number(CODE.RCV_SUCCESS)) { + let accessToken = resp?.accessToken || null; + let resultVO = parseJwt(accessToken); + let refreshToken = resp?.refreshToken || null; - // setSessionItem('accessToken', accessToken); - setLocalItem('accessToken', accessToken); - setLocalItem('refreshToken', refreshToken); - // setSessionItem('loginUser', resultVO); - props.onChangeLogin(resultVO); - if (saveIDFlag) { - setLocalItem(KEY_ID, resultVO?.id); + // setSessionItem('accessToken', accessToken); + setLocalItem('accessToken', accessToken); + setLocalItem('refreshToken', refreshToken); + // setSessionItem('loginUser', resultVO); + props.onChangeLogin(resultVO); + if (saveIDFlag) { + setLocalItem(KEY_ID, resultVO?.id); + } + navigate(URL.MAIN); + // PC와 Mobile 열린메뉴 닫기 + document.querySelector('.all_menu.WEB').classList.add('closed'); + document.querySelector('.btnAllMenu').classList.remove('active'); + document.querySelector('.btnAllMenu').title = '전체메뉴 닫힘'; + document.querySelector('.all_menu.Mobile').classList.add('closed'); + } else { + alert(resp.resultMessage) } - navigate(URL.MAIN); - // PC와 Mobile 열린메뉴 닫기 - document.querySelector('.all_menu.WEB').classList.add('closed'); - document.querySelector('.btnAllMenu').classList.remove('active'); - document.querySelector('.btnAllMenu').title = '전체메뉴 닫힘'; - document.querySelector('.all_menu.Mobile').classList.add('closed'); - } else { - alert(resp.resultMessage) } }) }