diff --git a/src/main/java/com/example/demo/app/domain/service/impl/PasswordResetServiceImpl.java b/src/main/java/com/example/demo/app/domain/service/impl/PasswordResetServiceImpl.java index 11c7069..55cfa26 100644 --- a/src/main/java/com/example/demo/app/domain/service/impl/PasswordResetServiceImpl.java +++ b/src/main/java/com/example/demo/app/domain/service/impl/PasswordResetServiceImpl.java @@ -1,5 +1,6 @@ package com.example.demo.app.domain.service.impl; +import org.mindrot.jbcrypt.BCrypt; import org.springframework.stereotype.Service; import com.example.demo.app.domain.service.PasswordResetService; @@ -13,30 +14,31 @@ import lombok.RequiredArgsConstructor; @RequiredArgsConstructor public class PasswordResetServiceImpl implements PasswordResetService { - private final UserRepository userRepository; + private final UserRepository userRepository; - @Override - public boolean resetPassword( - Long userId, - PasswordResetForm passwordResetForm) { + @Override + public boolean resetPassword( + Long userId, + PasswordResetForm passwordResetForm) { - if (!passwordResetForm.getPassword() - .equals(passwordResetForm.getPasswordConfirm())) { - return false; - } + if (!passwordResetForm.getPassword() + .equals(passwordResetForm.getPasswordConfirm())) { + return false; + } - UserEntity userEntity = - userRepository.findById(userId).orElse(null); + UserEntity userEntity = userRepository.findById(userId).orElse(null); - if (userEntity == null) { - return false; - } + if (userEntity == null) { + return false; + } - userEntity.setPassword( - passwordResetForm.getPassword()); + String passwordHashed = BCrypt.hashpw(passwordResetForm.getPassword(), BCrypt.gensalt()); - userRepository.save(userEntity); + userEntity.setPassword( + passwordHashed); - return true; - } + userRepository.save(userEntity); + + return true; + } } \ No newline at end of file diff --git a/src/main/java/com/example/demo/app/presentation/controller/PasswordResetController.java b/src/main/java/com/example/demo/app/presentation/controller/PasswordResetController.java index 0cba26f..a0fc051 100644 --- a/src/main/java/com/example/demo/app/presentation/controller/PasswordResetController.java +++ b/src/main/java/com/example/demo/app/presentation/controller/PasswordResetController.java @@ -62,7 +62,7 @@ public class PasswordResetController { (LoginModel) session.getAttribute("loginUser"); if (loginUser != null) { - return "redirect:/menu"; + return "redirect:/profile"; } return "redirect:/login";