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) } }) }