From a9fc8ef1502d0d00bb662dba3bc2d90c6e926edd Mon Sep 17 00:00:00 2001
From: JSYOO <JSYOO@DESKTOP-U1IONCV>
Date: Tue, 30 Nov 2021 11:46:13 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EB=A9=94=EC=9D=BC=20=EA=B3=84?=
 =?UTF-8?q?=EC=A0=95=ED=86=B5=ED=95=A9=EC=8B=9C=EC=97=90=EB=8F=84=20?=
 =?UTF-8?q?=EC=9E=90=EB=8F=99=EB=A1=9C=EA=B7=B8=EC=9D=B8(=EA=B8=B0?=
 =?UTF-8?q?=EC=A1=B4=20=ED=95=B8=EB=93=9C=ED=8F=B0=EB=B2=88=ED=98=B8?=
 =?UTF-8?q?=EB=A1=9C=20=EA=B5=AC=EB=B6=84=EB=90=98=EB=8A=94=20=EC=9E=90?=
 =?UTF-8?q?=EB=8F=99=EB=A1=9C=EA=B7=B8=EC=9D=B8=EC=9D=80=20=EB=90=98?=
 =?UTF-8?q?=EA=B3=A0=EC=9E=88=EC=97=88=EC=9D=8C)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/nlib/user/web/MemberController.java | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main/java/nlib/user/web/MemberController.java b/src/main/java/nlib/user/web/MemberController.java
index 6f802bdf..a00563a1 100644
--- a/src/main/java/nlib/user/web/MemberController.java
+++ b/src/main/java/nlib/user/web/MemberController.java
@@ -222,6 +222,10 @@ public class MemberController extends NlibCommonController{
 		String jsessionId = session.getId();
 		OAuthUniversalUser oauthUser = SessionConfig.getNewMemberInfo(jsessionId);
 		
+		String redirectUrl="";
+		
+		String url = request.getRequestURL().toString();
+		String councilHomeUrl=url.replaceAll(request.getRequestURI(), "") + request.getContextPath();
 		if(oauthUser == null)
 		{
 			model.addAttribute("msg","SNS인증이 정상적이지않습니다. 다시 회원가입을 진행해주세요.");
@@ -237,13 +241,18 @@ public class MemberController extends NlibCommonController{
 		{
 			oauthUser.setMbInfoId(vo.getMbInfoId());
 			memberService.insertMemberSns(oauthUser);
+			SessionConfig.setLoginInfo(jsessionId, oauthUser);
+			
+			session.setAttribute("councilReturnUrl","/member/accountConsolidationForm.do" );//자동로그인후 이동할페이지
+			redirectUrl = councilHomeUrl + NlibProperty.getString("nculture.login.post.login.redirect.uri");
+			
 			vo.setEmail(StringUtil.maskEmail(ariaCrypto.decode(vo.getEmail())));
 			vo.setName(StringUtil.maskName(vo.getName()));
 			oauthUser.setSnsUserId(StringUtil.maskEmail(oauthUser.getSnsUserId()));
 			model.addAttribute("result",vo);
 			model.addAttribute("oauthUser",oauthUser);
 			//통합처리 url
-			return "nlib/member/accountConsolidationForm";
+			return "redirect:" + redirectUrl;
 		}
 		model.addAttribute("loginVO",oauthUser);
 		return "nlib/member/insertMemberInfoForm";