somang4819/itsm_ysm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://docs.nculture.org:30000/nculture/iams.nlib

Browse Source
This commit is contained in:
JSYOO 2021-08-31 16:51:40 +09:00
commit 23f2b6fd98
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/nlib/user/web/LoginController.java
View File

@ -105,6 +105,7 @@ public class LoginController {
HttpServletResponse res, HttpServletResponse res,
HttpSession session, HttpSession session,
@RequestParam(required = false) String returnUrl, @RequestParam(required = false) String returnUrl,
@RequestParam(required = false) String callType,
ModelMap model) throws Exception { ModelMap model) throws Exception {
String url = req.getRequestURL().toString(); String url = req.getRequestURL().toString();
@ -131,6 +132,7 @@ public class LoginController {
session.setAttribute("councilDnsHost", councilDnsHost); session.setAttribute("councilDnsHost", councilDnsHost);
session.setAttribute("councilCd", councilCd); session.setAttribute("councilCd", councilCd);
session.setAttribute("councilNm", councilNm); session.setAttribute("councilNm", councilNm);
session.setAttribute("callType", callType);
log.debug("loginCouncil > sessionid=" + session.getId()); log.debug("loginCouncil > sessionid=" + session.getId());
log.debug("loginCouncil > REQ URL = " + url); log.debug("loginCouncil > REQ URL = " + url);
@ -140,13 +142,15 @@ public class LoginController {
log.debug("loginCouncil > councilHomeUrl = " + councilHomeUrl); log.debug("loginCouncil > councilHomeUrl = " + councilHomeUrl);
log.debug("loginCouncil > councilCd = " + councilCd); log.debug("loginCouncil > councilCd = " + councilCd);
log.debug("loginCouncil > councilNm = " + councilNm); log.debug("loginCouncil > councilNm = " + councilNm);
log.debug("loginCouncil > callType = " + callType);
String params = "councilJsessionId=" + session.getId() + String params = "councilJsessionId=" + session.getId() +
"&councilDnsHost=" + councilDnsHost + "&councilDnsHost=" + councilDnsHost +
"&councilCd=" + councilCd + "&councilCd=" + councilCd +
"&councilNm=" + StringUtil.encodeBase64(councilNm) + "&councilNm=" + StringUtil.encodeBase64(councilNm) +
"&councilHomeUrl=" + StringUtil.encodeBase64(councilHomeUrl) + "&councilHomeUrl=" + StringUtil.encodeBase64(councilHomeUrl) +
"&councilReturnUrl=" + StringUtil.encodeBase64(councilReturnUrl); "&councilReturnUrl=" + StringUtil.encodeBase64(councilReturnUrl) +
"&callType=" + StringUtil.getString(callType, "");
return "redirect:" + NlibProperty.getString("nculture.login.preset.redirect.url") + "?" + params; return "redirect:" + NlibProperty.getString("nculture.login.preset.redirect.url") + "?" + params;
} }
@ -179,6 +183,7 @@ public class LoginController {
String councilHomeUrl = StringUtil.decodeBase64(paramMap.get("councilHomeUrl")); String councilHomeUrl = StringUtil.decodeBase64(paramMap.get("councilHomeUrl"));
String councilCd = paramMap.get("councilCd"); String councilCd = paramMap.get("councilCd");
String councilNm = StringUtil.decodeBase64(paramMap.get("councilNm")); String councilNm = StringUtil.decodeBase64(paramMap.get("councilNm"));
String callType = paramMap.get("callType");
log.debug("loginPreSet > sessionid=" + session.getId()); log.debug("loginPreSet > sessionid=" + session.getId());
log.debug("loginPreSet > councilJsessionId = " + councilJsessionId); log.debug("loginPreSet > councilJsessionId = " + councilJsessionId);
@ -187,6 +192,7 @@ public class LoginController {
log.debug("loginPreSet > councilHomeUrl = " + councilHomeUrl); log.debug("loginPreSet > councilHomeUrl = " + councilHomeUrl);
log.debug("loginPreSet > councilCd = " + councilCd); log.debug("loginPreSet > councilCd = " + councilCd);
log.debug("loginPreSet > councilNm = " + councilNm); log.debug("loginPreSet > councilNm = " + councilNm);
log.debug("loginPreSet > callType = " + callType);
session.setAttribute("councilJsessionId", councilJsessionId); session.setAttribute("councilJsessionId", councilJsessionId);
session.setAttribute("councilReturnUrl", councilReturnUrl); session.setAttribute("councilReturnUrl", councilReturnUrl);
@ -195,8 +201,15 @@ public class LoginController {
session.setAttribute("councilDnsHost", councilDnsHost); session.setAttribute("councilDnsHost", councilDnsHost);
session.setAttribute("councilCd" , councilCd); session.setAttribute("councilCd" , councilCd);
session.setAttribute("councilNm" , councilNm); session.setAttribute("councilNm" , councilNm);
session.setAttribute("callType" , callType);
String redirect = null;
if(OAuthLogin.CALL_TYPE_MEMBER.equalsIgnoreCase(callType)) {
redirect = councilHomeUrl + NlibProperty.getString("nculture.member.redirect.uri");
} else {
redirect = councilHomeUrl + NlibProperty.getString("nculture.login.redirect.uri");
}
String redirect = councilHomeUrl + NlibProperty.getString("nculture.login.redirect.uri");
return "redirect:" + redirect; return "redirect:" + redirect;
} }

1
src/main/resources/nlib/nlib.properties
View File

@ -30,6 +30,7 @@ nculture.login.redirect.uri = /login/loginForm.do
nculture.login.post.login.redirect.uri = /login/loginCouncilSSO.do nculture.login.post.login.redirect.uri = /login/loginCouncilSSO.do
nculture.login.post.member.redirect.uri = /member/insertMemberInfoForm.do nculture.login.post.member.redirect.uri = /member/insertMemberInfoForm.do
nculture.login.preset.redirect.url = http://nlib.nculture.org/nlib/login/loginPreSet.do nculture.login.preset.redirect.url = http://nlib.nculture.org/nlib/login/loginPreSet.do
nculture.member.redirect.uri = /member/snsCertForm.do
#---------------------------------------- #----------------------------------------
# NLIB \uc9c0\ubc29\ubb38\ud654\uc6d0\uc815\ubcf4 # NLIB \uc9c0\ubc29\ubb38\ud654\uc6d0\uc815\ubcf4