수정

src/main/java/com/style24/front/support/interceptor/TsfDefaultInterceptor.java

@@ -25,11 +25,8 @@ public class TsfDefaultInterceptor extends HandlerInterceptorAdapter {
 
 	private static final String APP_PREFIX = "style24@";
 
-//	@Value("${has-ssl}")
-//	private String hasSsl;
-
 //	@Autowired
-//	private WfoPolicyService policyService;
+//	private TsfPolicyService policyService;
 
 	@Override
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
@@ -39,7 +36,7 @@ public class TsfDefaultInterceptor extends HandlerInterceptorAdapter {
 		log.info("request.getRequestURL(): [{}]", request.getRequestURL());
 		log.info("request.getQueryString(): [{}]", request.getQueryString());
 
-//		// 설정된 HTTPS 페이지 확인
+//		// 설정된 HTTPS 페이지 확인 (사이트 전체가 SSL 적용이 되어야 함으로 해당 부분 체크로직 주석 처리)
 //		String requestUrl = request.getRequestURL().toString();
 //		boolean bHttpsPage = this.isHttpsPage(isSslServer, requestUrl, request.getRequestURI());
 //		log.debug("bHttpsPage: [{}]", bHttpsPage);
@@ -133,7 +130,7 @@ public class TsfDefaultInterceptor extends HandlerInterceptorAdapter {
 					} else if (cnt == 1) {
 						TsfSession.setAttribute("appVersion", oneData);
 //					} else if (cnt == 2) {
-//						WfoSession.setAttribute("deviceToken", oneData);
+//						TsfSession.setAttribute("deviceToken", oneData);
 					}
 					cnt++;
 				}

src/main/java/com/style24/front/support/interceptor/TsfLoginCheckInterceptor.java

@@ -3,10 +3,13 @@ package com.style24.front.support.interceptor;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
+import com.style24.front.support.security.session.TsfSession;
+
 import lombok.extern.slf4j.Slf4j;
 
 /**
@@ -19,35 +22,33 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 public class TsfLoginCheckInterceptor extends HandlerInterceptorAdapter {
 
-//	@Value("${has-ssl}")
-//	private String hasSsl;
+	@Value("${has-ssl}")
+	private String hasSsl;
 
 	@Override
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-//		log.info("request.getServerName(): [{}]", request.getServerName());
-//
-//		// 로그인 되어 있지 않으면
-//		if (!FoSession.isLogin()) {
-//			boolean isAjaxCall = Boolean.parseBoolean(request.getHeader("AJAX"));
-//			log.info("isAjaxCall: {}", isAjaxCall);
-//
-//			if (isAjaxCall) { // ajax call
-//				// Ajax call은 status 세팅 후 ajax.status == 901일 경우 로그인 페이지로 이동 처리
-//				response.setStatus(901); // No Session
-//			} else { // Submit
-//				// SSL Server
-//				boolean isSslServer = Boolean.parseBoolean(hasSsl);
-//				log.info("isSslServer: [{}]", isSslServer);
-//
-//				String loginUrl = isSslServer ? "https://" + request.getServerName() + "/signin" : "/signin";
-//				log.info("loginUrl: [{}]", loginUrl);
-//
-//				response.sendRedirect(loginUrl);
-////				response.flushBuffer();
-//			}
-//
-//			return false;
-//		}
+		// 로그인 되어 있지 않으면
+		if (!TsfSession.isLogin()) {
+			boolean isAjaxCall = Boolean.parseBoolean(request.getHeader("AJAX"));
+			log.info("isAjaxCall: {}", isAjaxCall);
+
+			if (isAjaxCall) { // ajax call
+				// Ajax call은 status 세팅 후 ajax.status == 901일 경우 로그인 페이지로 이동 처리
+				response.setStatus(901); // No Session
+			} else { // Submit
+				// SSL Server
+				boolean isSslServer = Boolean.parseBoolean(hasSsl);
+				log.info("isSslServer: [{}]", isSslServer);
+
+				String loginUrl = isSslServer ? "https://" + request.getServerName() + "/signin" : "/signin";
+				log.info("loginUrl: [{}]", loginUrl);
+
+				response.sendRedirect(loginUrl);
+//				response.flushBuffer();
+			}
+
+			return false;
+		}
 
 		return super.preHandle(request, response, handler);
 	}

src/main/java/com/style24/front/support/interceptor/TsfReturnUrlInterceptor.java

@@ -3,12 +3,19 @@ package com.style24.front.support.interceptor;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
+import com.style24.front.support.env.TsfConstants;
+
 import lombok.extern.slf4j.Slf4j;
 
+import com.gagaframework.web.util.GagaCookieUtil;
+import com.gagaframework.web.util.GagaStringUtil;
+
 /**
  * Return URL Interceptor
  * 
@@ -19,33 +26,28 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 public class TsfReturnUrlInterceptor extends HandlerInterceptorAdapter {
 
-//	@Value("${has-ssl}")
-//	private String hasSsl;
+	@Value("${has-ssl}")
+	private String hasSsl;
 
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-//		log.info("request.isSecure(): [{}]", request.isSecure());
-//		log.info("request.getServerName(): [{}]", request.getServerName());
-//		log.info("request.getRequestURI(): [{}]", request.getRequestURI());
-//		log.info("request.getRequestURL(): [{}]", request.getRequestURL());
-//		log.info("request.getQueryString(): [{}]", request.getQueryString());
-//
-//		String queryString = GagaStringUtil.convertParameterToQueryString(request.getParameterMap());
-//		if (StringUtils.isNotBlank(queryString))
-//			queryString = "?" + queryString;
-//		log.info("queryString: [{}]", queryString);
-//
-//		String returnUrl = request.getRequestURL() + queryString;
-//		log.info("returnUrl: [{}]", returnUrl);
-//
-//		// SSL Server
-//		boolean isSslServer = Boolean.parseBoolean(hasSsl);
-//		log.debug("isSslServer: [{}]", isSslServer);
-//
-//		if (isSslServer) {
-//			GagaCookieUtil.setSecureCookie(response, FoConstants.CK_PREFIX + "_return_url", returnUrl, -1);
-//		} else {
-//			GagaCookieUtil.setCookie(response, FoConstants.CK_PREFIX + "_return_url", returnUrl, -1);
-//		}
+		String queryString = GagaStringUtil.convertParameterToQueryString(request.getParameterMap());
+		if (StringUtils.isNotBlank(queryString)) {
+			queryString = "?" + queryString;
+		}
+		log.info("queryString: [{}]", queryString);
+
+		String returnUrl = request.getRequestURL() + queryString;
+		log.info("returnUrl: [{}]", returnUrl);
+
+		// SSL Server
+		boolean isSslServer = Boolean.parseBoolean(hasSsl);
+		log.info("isSslServer: [{}]", isSslServer);
+
+		if (isSslServer) {
+			GagaCookieUtil.setSecureCookie(response, TsfConstants.CK_PREFIX + "_return_url", returnUrl, -1);
+		} else {
+			GagaCookieUtil.setCookie(response, TsfConstants.CK_PREFIX + "_return_url", returnUrl, -1);
+		}
 
 		return super.preHandle(request, response, handler);
 	}