From 192191d352f1a468d450890424445c7383c82262 Mon Sep 17 00:00:00 2001
From: s-morimoto <s-morimoto@iij.ad.jp>
Date: Thu, 17 Sep 2026 15:59:33 +0900
Subject: [PATCH] =?UTF-8?q?[ADD]=E3=83=91=E3=82=B9=E3=83=AF=E3=83=BC?=
 =?UTF-8?q?=E3=83=89=E5=86=8D=E8=A8=AD=E5=AE=9A=E3=81=AE=E4=BD=9C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/service/PasswordResetService.java  |  8 +++
 .../impl/PasswordResetServiceImpl.java        | 41 +++++++++++++
 .../controller/PasswordResetController.java   | 61 +++++++++++++++++++
 .../presentation/form/PasswordResetForm.java  | 13 ++++
 .../resources/templates/password_reset.html   | 42 +++++++++++++
 .../templates/user_register_confirm.html      |  2 +-
 6 files changed, 166 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/com/example/demo/app/domain/service/PasswordResetService.java
 create mode 100644 src/main/java/com/example/demo/app/domain/service/impl/PasswordResetServiceImpl.java
 create mode 100644 src/main/java/com/example/demo/app/presentation/controller/PasswordResetController.java
 create mode 100644 src/main/java/com/example/demo/app/presentation/form/PasswordResetForm.java
 create mode 100644 src/main/resources/templates/password_reset.html

diff --git a/src/main/java/com/example/demo/app/domain/service/PasswordResetService.java b/src/main/java/com/example/demo/app/domain/service/PasswordResetService.java
new file mode 100644
index 0000000..ec1140e
--- /dev/null
+++ b/src/main/java/com/example/demo/app/domain/service/PasswordResetService.java
@@ -0,0 +1,8 @@
+package com.example.demo.app.domain.service;
+
+import com.example.demo.app.presentation.form.PasswordResetForm;
+
+public interface PasswordResetService {
+
+    boolean resetPassword(Long userId, PasswordResetForm passwordResetForm);
+}
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
new file mode 100644
index 0000000..2866cea
--- /dev/null
+++ b/src/main/java/com/example/demo/app/domain/service/impl/PasswordResetServiceImpl.java
@@ -0,0 +1,41 @@
+package com.example.demo.app.domain.service.impl;
+
+import org.springframework.stereotype.Service;
+
+import com.example.demo.app.domain.service.PasswordResetService;
+import com.example.demo.app.infra.entity.UserEntity;
+import com.example.demo.app.infra.repository.UserRepository;
+import com.example.demo.app.presentation.form.PasswordResetForm;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class PasswordResetServiceImpl implements PasswordResetService {
+
+    private final UserRepository userRepository;
+
+    @Override
+    public boolean resetPassword(
+            Long userId,
+            PasswordResetForm passwordResetForm) {
+
+        if (!passwordResetForm.getPassword()
+                .equals(passwordResetForm.getPasswordConfirm())) {
+            return false;
+        }
+
+        UserEntity userEntity =
+                userRepository.findById(userId).orElse(null);
+
+        if (userEntity == null) {
+            return false;
+        }
+
+        userEntity.setPassword(passwordResetForm.getPassword());
+
+        userRepository.save(userEntity);
+
+        return true;
+    }
+}
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
new file mode 100644
index 0000000..b5fcfba
--- /dev/null
+++ b/src/main/java/com/example/demo/app/presentation/controller/PasswordResetController.java
@@ -0,0 +1,61 @@
+package com.example.demo.app.presentation.controller;
+
+import jakarta.servlet.http.HttpSession;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+
+import com.example.demo.app.domain.service.PasswordResetService;
+import com.example.demo.app.presentation.form.PasswordResetForm;
+
+import lombok.RequiredArgsConstructor;
+
+@Controller
+@RequiredArgsConstructor
+public class PasswordResetController {
+
+    private final PasswordResetService passwordResetService;
+
+    @GetMapping("/password_reset")
+    public String showPasswordReset(Model model) {
+
+        model.addAttribute(
+                "passwordResetForm",
+                new PasswordResetForm());
+
+        return "password_reset";
+    }
+
+    @PostMapping("/password_reset")
+    public String resetPassword(
+            PasswordResetForm passwordResetForm,
+            Model model,
+            HttpSession session) {
+
+        Long userId =
+                (Long) session.getAttribute("passwordResetUserId");
+
+        if (userId == null) {
+            return "redirect:/login";
+        }
+
+        boolean isReset =
+                passwordResetService.resetPassword(
+                        userId,
+                        passwordResetForm);
+
+        if (!isReset) {
+            model.addAttribute(
+                    "errorMessage",
+                    "パスワードが一致していません。");
+
+            return "password_reset";
+        }
+
+        session.removeAttribute("passwordResetUserId");
+
+        return "redirect:/login";
+    }
+}
diff --git a/src/main/java/com/example/demo/app/presentation/form/PasswordResetForm.java b/src/main/java/com/example/demo/app/presentation/form/PasswordResetForm.java
new file mode 100644
index 0000000..3213e1b
--- /dev/null
+++ b/src/main/java/com/example/demo/app/presentation/form/PasswordResetForm.java
@@ -0,0 +1,13 @@
+package com.example.demo.app.presentation.form;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PasswordResetForm {
+    private String password;
+    private String passwordConfirm;
+}
diff --git a/src/main/resources/templates/password_reset.html b/src/main/resources/templates/password_reset.html
new file mode 100644
index 0000000..522fd4b
--- /dev/null
+++ b/src/main/resources/templates/password_reset.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html lang="ja"xmlns:th="http://www.thymeleaf.org">
+<head>
+<meta charset="UTF-8">
+<title>パスワード再設定</title>
+</head>
+<body>
+	<header></header>
+	
+	<main>
+		<h1>パスワード再設定</h1>
+		
+		<form th:action="@{/password_reset}" th:obiect="${passwordResteForm"} method="post">
+			<div>
+				<label for="password">新しいパスワード</label>
+				<input type="password"
+				id="password"
+				th:field="*{password}"
+				minlength="8"
+				maxlength="255"
+				required>
+			</div>
+			
+			<div>
+				<label for="passwordConfirm">パスワード確認</label>
+				<input type="password"
+				id="passwordConfirm"
+				th:field="*{passwordConfirm}"
+				minlength="8"
+				maxlength="255"
+				required>
+			</div>
+			
+			<button type="submit">再設定</button>
+		</form>
+		
+		<div th:if="${errorMessage}">
+		    <p th:text="${errorMessage}"></p>
+		</div>
+	</main>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/user_register_confirm.html b/src/main/resources/templates/user_register_confirm.html
index aad56dd..2b35041 100644
--- a/src/main/resources/templates/user_register_confirm.html
+++ b/src/main/resources/templates/user_register_confirm.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="ja"xmlns:th="http://www.thymeleaf.org">
 <head>
 <meta charset="UTF-8">
 <title>新規会員登録確認</title>