tolag3/koipa_edu_2025-1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'JIWOO' into advc

Browse Source
This commit is contained in:
jiwoo 2023-10-20 12:25:59 +09:00
commit c0fbc639fd
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/kcc/let/uat/uia/web/APILoginContoller.java
View File

@ -33,6 +33,7 @@ import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper;
import kcc.com.cmm.LoginVO; import kcc.com.cmm.LoginVO;
import kcc.com.utl.fcc.service.EgovStringUtil; import kcc.com.utl.fcc.service.EgovStringUtil;
import kcc.let.uat.uia.service.EgovLoginService; import kcc.let.uat.uia.service.EgovLoginService;
import kcc.let.uat.uia.service.SsoLoginVO;
import kcc.let.uss.umt.service.EgovUserManageService; import kcc.let.uss.umt.service.EgovUserManageService;
import kcc.let.uss.umt.service.UserManageVO; import kcc.let.uss.umt.service.UserManageVO;
import kcc.let.utl.sim.service.EgovClntInfo; import kcc.let.utl.sim.service.EgovClntInfo;
@ -113,12 +114,16 @@ public class APILoginContoller {
loginVO.setIp(EgovClntInfo.getClntIP(request)); loginVO.setIp(EgovClntInfo.getClntIP(request));
LoginVO resultVO = loginService.APIActionLogin(loginVO); LoginVO resultVO = loginService.APIActionLogin(loginVO);
//23.10.19 - SSO세션 추가. 개발자 로그인을 위해 SSO세션 사용 유지
SsoLoginVO ssoLoginVO = new SsoLoginVO();
/*ssoLoginVO.setOtherUser("Y");*/
ssoLoginVO.setMembSeq("1");
if (loginService.getUserAuth(resultVO) != null) { if (loginService.getUserAuth(resultVO) != null) {
resultVO.setAuthority(loginService.getUserAuth(resultVO).getAuthority()); resultVO.setAuthority(loginService.getUserAuth(resultVO).getAuthority());
} }
resultVO.setUrl(returnUrl); resultVO.setUrl(returnUrl);
request.getSession().setAttribute("LoginVO", resultVO); // LoginVO세션 생성 request.getSession().setAttribute("LoginVO", resultVO); // LoginVO세션 생성
request.getSession().setAttribute("SSOLoginVO", resultVO); // SSOLogin세션 사용 유지 request.getSession().setAttribute("SSOLoginVO", ssoLoginVO);
UsernamePasswordAuthenticationFilter springSecurity = new UsernamePasswordAuthenticationFilter(); UsernamePasswordAuthenticationFilter springSecurity = new UsernamePasswordAuthenticationFilter();
ApplicationContext act = WebApplicationContextUtils.getRequiredWebApplicationContext(request.getSession().getServletContext()); ApplicationContext act = WebApplicationContextUtils.getRequiredWebApplicationContext(request.getSession().getServletContext());
Map<String, UsernamePasswordAuthenticationFilter> beans = act.getBeansOfType(UsernamePasswordAuthenticationFilter.class); Map<String, UsernamePasswordAuthenticationFilter> beans = act.getBeansOfType(UsernamePasswordAuthenticationFilter.class);
@ -335,11 +340,16 @@ public class APILoginContoller {
loginVO.setIp(EgovClntInfo.getClntIP(request)); loginVO.setIp(EgovClntInfo.getClntIP(request));
LoginVO resultVO = loginService.APIActionLogin(loginVO); LoginVO resultVO = loginService.APIActionLogin(loginVO);
//23.10.19 - SSO세션 추가. actionLogin에서 SSO세션 오류로 인해 임시로 추가
SsoLoginVO ssoLoginVO = new SsoLoginVO();
ssoLoginVO.setOtherUser("Y");
ssoLoginVO.setMembSeq("1");
if (loginService.getUserAuth(resultVO) != null) { if (loginService.getUserAuth(resultVO) != null) {
resultVO.setAuthority(loginService.getUserAuth(resultVO).getAuthority()); resultVO.setAuthority(loginService.getUserAuth(resultVO).getAuthority());
} }
resultVO.setUrl(returnUrl); resultVO.setUrl(returnUrl);
request.getSession().setAttribute("LoginVO", resultVO); // LoginVO세션 생성 request.getSession().setAttribute("LoginVO", resultVO); // LoginVO세션 생성
request.getSession().setAttribute("SSOLoginVO", ssoLoginVO); // SSOLogin세션 사용 유지
UsernamePasswordAuthenticationFilter springSecurity = new UsernamePasswordAuthenticationFilter(); UsernamePasswordAuthenticationFilter springSecurity = new UsernamePasswordAuthenticationFilter();
ApplicationContext act = WebApplicationContextUtils.getRequiredWebApplicationContext(request.getSession().getServletContext()); ApplicationContext act = WebApplicationContextUtils.getRequiredWebApplicationContext(request.getSession().getServletContext());
Map<String, UsernamePasswordAuthenticationFilter> beans = act.getBeansOfType(UsernamePasswordAuthenticationFilter.class); Map<String, UsernamePasswordAuthenticationFilter> beans = act.getBeansOfType(UsernamePasswordAuthenticationFilter.class);