비밀번호 변경 페이지 추가

src/main/java/com/eactive/httpmockserver/common/exception/CustomGlobalExceptionHandler.java

@@ -1,5 +1,6 @@
 package com.eactive.httpmockserver.common.exception;
 
+import org.springframework.core.annotation.Order;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ExceptionHandler;
@@ -10,6 +11,7 @@ import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExcep
 
 import java.time.LocalDateTime;
 
+@Order(1)
 @RestControllerAdvice(annotations = RestController.class)
 public class CustomGlobalExceptionHandler extends ResponseEntityExceptionHandler {
 

src/main/java/com/eactive/httpmockserver/common/exception/PortalGlobalExceptionHandler.java

@@ -3,6 +3,7 @@ package com.eactive.httpmockserver.common.exception;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
@@ -11,6 +12,7 @@ import org.springframework.web.servlet.ModelAndView;
 import javax.servlet.http.HttpServletRequest;
 
 @ControllerAdvice(annotations = Controller.class)
+@Order(2)
 public class PortalGlobalExceptionHandler {
 
     private final Logger log = LoggerFactory.getLogger(getClass());

src/main/java/com/eactive/httpmockserver/config/PortalAuthenticationFailureHandler.java

@@ -1,6 +1,7 @@
 package com.eactive.httpmockserver.config;
 
 import com.eactive.httpmockserver.common.entity.EnabledStatus;
+import com.eactive.httpmockserver.common.exception.UserNotFoundException;
 import com.eactive.httpmockserver.login.controller.LoginController;
 import com.eactive.httpmockserver.user.entity.StaffUser;
 import com.eactive.httpmockserver.user.entity.User;
@@ -29,23 +30,25 @@ public class PortalAuthenticationFailureHandler implements AuthenticationFailure
 
 
     @Override
-    @Transactional(propagation = Propagation.REQUIRES_NEW)
+    @Transactional(propagation = Propagation.REQUIRES_NEW, noRollbackFor = {AuthenticationException.class, UserNotFoundException.class})
     public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response, AuthenticationException exception) throws IOException {
 
         String username = request.getParameter("id");
+        try {
+            User user = userService.findByUserId(username);
+            if (user != null) {
+                user.setLockCnt(user.getLockCnt() + 1);
+                if (user.getLockCnt() >= 5) {
+                    user.setLockAt(EnabledStatus.Y);
+                }
 
-        User user = userService.findByUserId(username);
-        user.setLockCnt(user.getLockCnt() + 1);
-        if (user.getLockCnt() >= 5) {
-            user.setLockAt(EnabledStatus.Y);
+                staffUserRepository.save((StaffUser) user);
+            }
+        } catch (UserNotFoundException ignored) {
         }
 
-        staffUserRepository.save((StaffUser) user);
-
-        request.getSession().setAttribute(LoginController.LOGIN_MESSAGE, exception.getMessage());
-
+        request.getSession().setAttribute(LoginController.LOGIN_MESSAGE, exception.getLocalizedMessage());
         String contextPath = request.getContextPath();
-
         response.sendRedirect(contextPath + "/login");
     }
 }

src/main/java/com/eactive/httpmockserver/config/PortalAuthenticationManager.java

@@ -30,9 +30,9 @@ public class PortalAuthenticationManager implements AuthenticationManager {
         UsernamePasswordAuthenticationToken token = (UsernamePasswordAuthenticationToken) authentication;
         String username = token.getName();
         String password = token.getCredentials().toString();
+        String encryptPassword = encryptionUtil.encryptPassword(password, username);
 
         UserDetails user = userService.loadUserByUsername(username);
-        String encryptPassword = encryptionUtil.encryptPassword(password, username);
 
         if (!user.isEnabled()) {
             throw new DisabledException("계정이 " + ((User) user).getStatus().getDescription() + "상태입니다. 관리자에게 문의하세요.");
@@ -47,8 +47,6 @@ public class PortalAuthenticationManager implements AuthenticationManager {
             UsernamePasswordAuthenticationToken authorityToken = new UsernamePasswordAuthenticationToken(user, password, user.getAuthorities());
             authorityToken.setDetails(user);
             SecurityContextHolder.getContext().setAuthentication(authorityToken);
-            ((User) user).setLockCnt(0);
-            userService.updateUser((User) user);
             return authorityToken;
         }
 

src/main/java/com/eactive/httpmockserver/config/PortalConfigAppDatasource.java

@@ -3,10 +3,13 @@ package com.eactive.httpmockserver.config;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
 import org.springframework.data.domain.AuditorAware;
 import org.springframework.data.envers.repository.support.EnversRevisionRepositoryFactoryBean;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.orm.jpa.JpaTransactionManager;
+import org.springframework.transaction.PlatformTransactionManager;
 
 /**
  * @author

src/main/java/com/eactive/httpmockserver/user/controller/AccountController.java

@@ -26,7 +26,7 @@ public class AccountController {
 
     @GetMapping("/change_password.do")
     public String changePassword(ModelMap model, @ModelAttribute("passwordChangeRequest") PasswordChangeRequestDTO passwordChangeRequestDTO) {
-        return "apps/main/updatePw";
+        return "page/updatePw";
     }
 
     @PostMapping(value = "/update_password.do")
@@ -39,7 +39,7 @@ public class AccountController {
 
         if (result.hasErrors()) {
             model.addAttribute("errors", result);
-            return "apps/main/updatePw";
+            return "page/updatePw";
         }
 
         String oldPassword = passwordChangeRequestDTO.getOldPassword();
@@ -51,7 +51,7 @@ public class AccountController {
         model.addAttribute("resultMsg", resultMsg);
         model.addAttribute("passwordChangeRequest", new PasswordChangeRequestDTO());
 
-        return "apps/main/updatePw";
+        return "page/updatePw";
     }
 
 

src/main/java/com/eactive/httpmockserver/user/service/UserService.java

@@ -28,7 +28,11 @@ public class UserService implements UserDetailsService {
 
     @Override
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
-        return staffUserRepository.findByUserId(username).orElseThrow(() -> new UserNotFoundException(USER_NOT_FOUND_MESSAGE));
+        try {
+            return findByUserId(username);
+        } catch (UserNotFoundException e) {
+            throw new UsernameNotFoundException(e.getMessage());
+        }
     }
 
     public User findByUserId(String userId) {