From b6a053cfc03f2f9752a11005b1e9c6b43682aec5 Mon Sep 17 00:00:00 2001
From: KNKIM <knkim@digitalship.co.kr>
Date: Tue, 31 Aug 2021 16:51:29 +0900
Subject: [PATCH] =?UTF-8?q?=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85=20?=
 =?UTF-8?q?=EB=8F=84=EB=A9=94=EC=9D=B8=20=EC=B2=98=EB=A6=AC=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/nlib/user/web/LoginController.java     | 17 +++++++++++++++--
 src/main/resources/nlib/nlib.properties         |  1 +
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/main/java/nlib/user/web/LoginController.java b/src/main/java/nlib/user/web/LoginController.java
index 3686ac32..44b561e7 100644
--- a/src/main/java/nlib/user/web/LoginController.java
+++ b/src/main/java/nlib/user/web/LoginController.java
@@ -105,6 +105,7 @@ public class LoginController {
 			HttpServletResponse res,
 			HttpSession session,
 			@RequestParam(required = false) String returnUrl,
+			@RequestParam(required = false) String callType,
 			ModelMap model) throws Exception {
 		
 		String url = req.getRequestURL().toString();
@@ -131,6 +132,7 @@ public class LoginController {
 		session.setAttribute("councilDnsHost", councilDnsHost);
 		session.setAttribute("councilCd", councilCd);
 		session.setAttribute("councilNm", councilNm);
+		session.setAttribute("callType", callType);
 		
 		log.debug("loginCouncil > sessionid=" + session.getId());
 		log.debug("loginCouncil > REQ URL = " + url);
@@ -140,13 +142,15 @@ public class LoginController {
 		log.debug("loginCouncil > councilHomeUrl = " + councilHomeUrl);
 		log.debug("loginCouncil > councilCd = " + councilCd);
 		log.debug("loginCouncil > councilNm = " + councilNm);
+		log.debug("loginCouncil > callType = " + callType);
 		
 		String params = "councilJsessionId=" + session.getId() + 
 				"&councilDnsHost=" + councilDnsHost + 
 				"&councilCd=" + councilCd +
 				"&councilNm=" + StringUtil.encodeBase64(councilNm) +
 				"&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;
 	}
@@ -179,6 +183,7 @@ public class LoginController {
 		String councilHomeUrl    = StringUtil.decodeBase64(paramMap.get("councilHomeUrl"));
 		String councilCd         = paramMap.get("councilCd");
 		String councilNm         = StringUtil.decodeBase64(paramMap.get("councilNm"));
+		String callType          = paramMap.get("callType");
 		
 		log.debug("loginPreSet > sessionid=" + session.getId());
 		log.debug("loginPreSet > councilJsessionId = " + councilJsessionId);
@@ -187,6 +192,7 @@ public class LoginController {
 		log.debug("loginPreSet > councilHomeUrl = " + councilHomeUrl);
 		log.debug("loginPreSet > councilCd = " + councilCd);
 		log.debug("loginPreSet > councilNm = " + councilNm);
+		log.debug("loginPreSet > callType = " + callType);
 
 		session.setAttribute("councilJsessionId", councilJsessionId);
 		session.setAttribute("councilReturnUrl", councilReturnUrl);
@@ -195,8 +201,15 @@ public class LoginController {
 		session.setAttribute("councilDnsHost", councilDnsHost);
 		session.setAttribute("councilCd"  , councilCd);
 		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;
 	}
 	
diff --git a/src/main/resources/nlib/nlib.properties b/src/main/resources/nlib/nlib.properties
index 47d8dc97..5fa88365 100644
--- a/src/main/resources/nlib/nlib.properties
+++ b/src/main/resources/nlib/nlib.properties
@@ -30,6 +30,7 @@ nculture.login.redirect.uri = /login/loginForm.do
 nculture.login.post.login.redirect.uri = /login/loginCouncilSSO.do
 nculture.login.post.member.redirect.uri = /member/insertMemberInfoForm.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