Merge branch 'develop' into bin2107

src/main/java/com/style24/front/biz/thirdparty/Yes24Login.java

@@ -127,16 +127,16 @@ public class Yes24Login {
 	 */
 	public GagaMap getUserInfo(String inpin) {
 		GagaMap result = new GagaMap();
+		try {
+			// 1. ipin 복호화
+			String decryptIpin = CryptoUtils.decryptYes24AES(inpin);
 
-		// 1. ipin 복호화
-		String decryptIpin = CryptoUtils.decryptYes24AES(inpin);
+			// 2. ipin 값에서 ci 값 분리
+			String decryptIpinValues[] = decryptIpin.split("\\|");
 
-		// 2. ipin 값에서 ci 값 분리
-		String decryptIpinValues[] = decryptIpin.split("\\|");
+			// 3. Ci 다시 암호화
+			String encryptCi = CryptoUtils.encryptYes24AES(decryptIpinValues[1]);
 
-		// 3. Ci 다시 암호화
-		String encryptCi = CryptoUtils.encryptYes24AES(decryptIpinValues[1]);
-		try {
 			MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
 			params.add("str_ci", encryptCi);
 			params.add("str_Type", type);

src/main/java/com/style24/front/biz/web/TsfIndexController.java

@@ -212,7 +212,12 @@ public class TsfIndexController extends TsfBaseController {
 	 * @since 2021. 02. 23
 	 */
 	@RequestMapping("/signin/snsLoginCallback")
-	public ModelAndView signinSnsLoginCallback(@RequestParam(value = "snsType", required = false) String snsType, HttpSession session, @RequestParam(value = "code", required = false) String code, @RequestParam(value = "state", required = false) String state, @RequestParam(value = "error", required = false) boolean isError, HttpServletRequest request) {
+	public ModelAndView signinSnsLoginCallback(@RequestParam(value = "snsType", required = false) String snsType
+			, @RequestParam(value = "code", required = false) String code
+			, @RequestParam(value = "state", required = false) String state
+			, @RequestParam(value = "error", required = false) boolean isError
+			, HttpSession session
+			, HttpServletRequest request) {
 
 		ModelAndView mav = new ModelAndView();
 
@@ -256,7 +261,7 @@ public class TsfIndexController extends TsfBaseController {
 		GagaMap resultMap = new GagaMap();
 		if (isSnsLoing) {
 			CustSnsInfo custSnsInfo = objectMapper.convertValue(userInfo, CustSnsInfo.class);
-			log.info("custSnsInfo ==> {}", custSnsInfo.toString());
+			//log.info("custSnsInfo ==> {}", custSnsInfo.toString());
 
 			//SNS 로그인 처리
 			resultMap = customerService.customerSnsProcessing(custSnsInfo);
@@ -274,6 +279,8 @@ public class TsfIndexController extends TsfBaseController {
 			if ("EMPTY_PHONE_CUST".equals(custStat)) {
 				session.setAttribute("custSnsInfo", custSnsInfo);
 			}
+		} else {
+			resultMap.setString("custStat", "FAIL_CUST");
 		}
 
 		mav.addObject("resultMap", resultMap);
@@ -311,6 +318,7 @@ public class TsfIndexController extends TsfBaseController {
 		// SNS 로그인 성공시 정보 세션 저장
 		if (isSnsLoing) {
 			CustSnsInfo custSnsInfo = objectMapper.convertValue(userInfo, CustSnsInfo.class);
+			//log.info("custSnsInfo ==> {}", custSnsInfo.toString());
 			resultMap.setString("snsId", custSnsInfo.getSnsId());
 			resultMap.setString("snsType", custSnsInfo.getSnsType());