shjung 2 years ago
parent
commit
333957840a

+ 2 - 3
src/main/java/com/its/op/controller/its/LoginController.java

@@ -84,8 +84,7 @@ public class LoginController {
             //log.error("getLogin3: session, {}", session.toString());
             session.invalidate();   // session remove
         }
-        //return new ModelAndView("forward:/application/login/login.html");
-        return new ModelAndView("redirect:/application/login/login.html");
+        return new ModelAndView("redirect:" + WebConstants.LOGIN_PAGE_URI);
     }
 
     public String getSessionUserId(HttpServletRequest request) {
@@ -183,7 +182,7 @@ public class LoginController {
             session.invalidate();   // session remove
         }
         new SecurityContextLogoutHandler().logout(request, response, SecurityContextHolder.getContext().getAuthentication());
-        return new ModelAndView("redirect:/application/login/login.html");
+        return new ModelAndView("redirect:" + WebConstants.LOGIN_PAGE_URI);
     }
 
     private void expiredCookie(HttpServletResponse response, String cookieName) {

+ 2 - 0
src/main/java/com/its/op/security/WebConstants.java

@@ -2,6 +2,8 @@ package com.its.op.security;
 
 public interface WebConstants {
 
+    String LOGIN_PAGE_URI = "/application/login/login.html";
+    String DEFAULT_URI = "/application/op/00.main/main.html";
     String USER_UUID = "UUID";
     String USER_TIME = "TIME";
     String USER_OPER_SYST_ID = "OPER_SYST_ID";

+ 2 - 2
src/main/java/com/its/op/security/WebController.java

@@ -34,10 +34,10 @@ public class WebController {
         Authentication auth = SecurityContextHolder.getContext().getAuthentication();
         if(auth != null) {
             log.error("getLogin2: {}", auth);
-            return new ModelAndView("redirect:/application/op/00.main/main.html");
+            return new ModelAndView("redirect:" + WebConstants.DEFAULT_URI);
             //new SecurityContextLogoutHandler().logout(request, response, auth);
         }
-        return new ModelAndView("forward:/application/login/login.html");
+        return new ModelAndView("forward:" + WebConstants.LOGIN_PAGE_URI);
         //return new ModelAndView("forward:/api/auth/login.do");
     }
 

+ 1 - 1
src/main/java/com/its/op/security/WebLoginFailureHandler.java

@@ -46,6 +46,6 @@ public class WebLoginFailureHandler implements AuthenticationFailureHandler {
         request.setAttribute(key, message);
 
         message = URLEncoder.encode(message, "UTF-8");
-        response.sendRedirect("/application/login/login.html?LoginFail=" + message);
+        response.sendRedirect(WebConstants.LOGIN_PAGE_URI + "?LoginFail=" + message);
     }
 }

+ 1 - 2
src/main/java/com/its/op/security/WebLoginSuccessHandler.java

@@ -57,8 +57,7 @@ public class WebLoginSuccessHandler implements AuthenticationSuccessHandler {
 
         //log.info("cnncHs: {}, {}", cnncHs.getUserId(), cnncHs.getLoginHms());
 
-        String defaultSuccessUrl = "/application/op/00.main/main.html";
-        String uri = defaultSuccessUrl;
+        String uri = WebConstants.DEFAULT_URI;
         String domain = "/";
 
         HttpSession session = request.getSession();

+ 2 - 2
src/main/java/com/its/op/security/WebMvcConfig.java

@@ -43,8 +43,8 @@ public class WebMvcConfig implements WebMvcConfigurer {
 
     @Override
     public void addViewControllers(ViewControllerRegistry registry) {
-        //registry.addRedirectViewController("/api/auth/login.do", "/application/login/login.html");
-        //registry.addViewController("/api/auth/login.do").setViewName("/application/login/login.html");
+        //registry.addRedirectViewController("/api/auth/login.do", WebConstants.LOGIN_PAGE_URI);
+        //registry.addViewController("/api/auth/login.do").setViewName(WebConstants.LOGIN_PAGE_URI);
     }
 
     @Override

+ 3 - 3
src/main/java/com/its/op/security/WebSecurityConfig.java

@@ -73,8 +73,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 
         // URL 권한 설정
         //setAntMatchers(http, "ROLE_");
-        String loginPage = "/application/login/login.html";         // 로그인 할 경우 URL
-//        String loginPage = "/application/op/00.main/main.html";   // 로그인 하지 않을 경우 URL
+        String loginPage = WebConstants.LOGIN_PAGE_URI;     // 로그인 할 경우 URL
+//        String loginPage = WebConstants.DEFAULT_URI;        // 로그인 하지 않을 경우 URL
 
         try {
             http.csrf().disable();  // REST API 호출 유효하게(POST...)
@@ -103,7 +103,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                     .formLogin()
                     .loginPage(loginPage)
                     .loginProcessingUrl("/api/auth/login.do")
-                    .defaultSuccessUrl("/application/op/00.main/main.html", true)
+                    .defaultSuccessUrl(WebConstants.DEFAULT_URI, true)
                     .usernameParameter("username")
                     .passwordParameter("password")
                     .successHandler(this.webLoginSuccessHandler)