diff --git a/src/main/java/com/eactive/apim/portal/apps/login/controller/AccountRecoveryController.java b/src/main/java/com/eactive/apim/portal/apps/login/controller/AccountRecoveryController.java index 433870d..4d6030e 100644 --- a/src/main/java/com/eactive/apim/portal/apps/login/controller/AccountRecoveryController.java +++ b/src/main/java/com/eactive/apim/portal/apps/login/controller/AccountRecoveryController.java @@ -119,7 +119,7 @@ public class AccountRecoveryController { try { // 사용자 정보 확인 - portalUserAuthService.initializePassword( + portalUserAuthService.resetPassword( passwordReset.getLoginId(), passwordReset.getUserName(), passwordReset.getMobileNumber() diff --git a/src/main/java/com/eactive/apim/portal/apps/user/service/PortalUserAuthService.java b/src/main/java/com/eactive/apim/portal/apps/user/service/PortalUserAuthService.java index 3ec73a5..94fe33a 100644 --- a/src/main/java/com/eactive/apim/portal/apps/user/service/PortalUserAuthService.java +++ b/src/main/java/com/eactive/apim/portal/apps/user/service/PortalUserAuthService.java @@ -94,13 +94,16 @@ public class PortalUserAuthService implements UserDetailsService { return portalUserRepository.findPortalUserByEmailAddr(emailAddr).orElseThrow(() -> new UserNotFoundException("USER_NOT_FOUND_MESSAGE")); } - public void initializePassword(String loginId, String userName, String mobileNumber) { + public void resetPassword(String loginId, String userName, String mobileNumber) { PortalUser portalUser = portalUserRepository.findByLoginIdAndUserNameAndMobileNumber(loginId, userName, mobileNumber) .orElseThrow(() -> new UserNotFoundException("일치하는 사용자 정보를 찾을 수 없습니다.")); String tempPassword = EncryptionUtil.generateNewPasswordForKjbank(loginId); portalUser.setPasswordHash(passwordEncoder.encode(tempPassword)); + if ("Y".equalsIgnoreCase(portalUser.getAccountLockYn())) { + portalUser.setAccountLockYn("N"); + } portalUserRepository.save(portalUser); HashMap params = new HashMap<>();