From 2c445c19042b3e9e45da35ac20f390ed8ae353e0 Mon Sep 17 00:00:00 2001
From: s-choi <choi-suyeong@iij.ad.jp>
Date: Fri, 25 Sep 2026 16:09:36 +0900
Subject: [PATCH] =?UTF-8?q?[FIX]=20=E3=83=AD=E3=82=B0=E3=82=A4=E3=83=B3?=
 =?UTF-8?q?=E3=81=97=E3=81=A6=E3=82=8B=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC?=
 =?UTF-8?q?=E3=81=AF=E3=83=91=E3=82=B9=E3=83=AF=E3=83=BC=E3=83=89=E5=86=8D?=
 =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E5=BE=8C=E3=83=97=E3=83=AD=E3=83=95=E3=82=A3?=
 =?UTF-8?q?=E3=83=BC=E3=83=AB=E7=94=BB=E9=9D=A2=E3=81=AB=E6=88=BB=E3=82=8B?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3=E3=83=BB=E3=83=91?=
 =?UTF-8?q?=E3=82=B9=E3=83=AF=E3=83=BC=E3=83=89=E5=86=8D=E8=A8=AD=E5=AE=9A?=
 =?UTF-8?q?=E3=81=AE=E9=9A=9B=E3=83=8F=E3=83=83=E3=82=B7=E3=83=A5=E5=8C=96?=
 =?UTF-8?q?=E5=87=A6=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PasswordResetServiceImpl.java        | 40 ++++++++++---------
 .../controller/PasswordResetController.java   |  2 +-
 2 files changed, 22 insertions(+), 20 deletions(-)

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";