From 82823313397503b06978df3d6c73d4ced82d9998 Mon Sep 17 00:00:00 2001
From: s-morimoto <s-morimoto@iij.ad.jp>
Date: Thu, 24 Sep 2026 09:41:04 +0900
Subject: [PATCH] =?UTF-8?q?[EDIT]=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=BE=E3=81=A7=E3=81=AE?=
 =?UTF-8?q?=E9=81=B7=E7=A7=BB=E3=81=AE=E3=83=90=E3=82=B0=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/AuthenticationServiceImpl.java       | 21 ++++++++++++++++++-
 .../controller/AuthenticationController.java  |  8 ++++---
 .../presentation/form/AuthenticationForm.java |  2 +-
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/example/demo/app/domain/service/impl/AuthenticationServiceImpl.java b/src/main/java/com/example/demo/app/domain/service/impl/AuthenticationServiceImpl.java
index 89ac9f4..c95c7d9 100644
--- a/src/main/java/com/example/demo/app/domain/service/impl/AuthenticationServiceImpl.java
+++ b/src/main/java/com/example/demo/app/domain/service/impl/AuthenticationServiceImpl.java
@@ -24,19 +24,38 @@ public class AuthenticationServiceImpl implements AuthenticationService {
                 .orElse(null);
 
         if (userEntity == null) {
+            System.out.println("ユーザーなし");
             return null;
         }
 
+        System.out.println("DB質問ID="
+                + userEntity.getQuestionEntity().getSecretQuestionId());
+
+        System.out.println("入力質問ID="
+                + authenticationForm.getSecretQuestionId());
+
         if (!userEntity.getQuestionEntity().getSecretQuestionId()
                 .equals(authenticationForm.getSecretQuestionId())) {
+
+            System.out.println("質問ID不一致");
             return null;
         }
 
+        System.out.println("DB回答=["
+                + userEntity.getSecretQuestionAnswer() + "]");
+
+        System.out.println("入力回答=["
+                + authenticationForm.getSecretAnswer() + "]");
+
         if (!userEntity.getSecretQuestionAnswer()
                 .equals(authenticationForm.getSecretAnswer())) {
+
+            System.out.println("回答不一致");
             return null;
         }
 
+        System.out.println("認証OK");
+
         return new AuthenticationModel(userEntity.getUserId());
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/example/demo/app/presentation/controller/AuthenticationController.java b/src/main/java/com/example/demo/app/presentation/controller/AuthenticationController.java
index 5fe5c44..504e991 100644
--- a/src/main/java/com/example/demo/app/presentation/controller/AuthenticationController.java
+++ b/src/main/java/com/example/demo/app/presentation/controller/AuthenticationController.java
@@ -7,11 +7,11 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 
-import com.example.demo.aop.aspect.SessionCheck;
 import com.example.demo.app.domain.model.AuthenticationModel;
 import com.example.demo.app.domain.service.AuthenticationService;
 import com.example.demo.app.infra.repository.QuestionRepository;
 import com.example.demo.app.presentation.form.AuthenticationForm;
+import com.example.demo.app.presentation.form.PasswordResetForm;
 
 import lombok.RequiredArgsConstructor;
 
@@ -22,7 +22,6 @@ public class AuthenticationController {
     private final AuthenticationService authenticationService;
     private final QuestionRepository questionRepository;
 
-    @SessionCheck
     @GetMapping("/authentication")
     public String showAuthentication(Model model) {
 
@@ -32,7 +31,6 @@ public class AuthenticationController {
         return "authentication";
     }
     
-    @SessionCheck
     @PostMapping("/authentication")
     public String authenticate(
             AuthenticationForm authenticationForm,
@@ -53,6 +51,10 @@ public class AuthenticationController {
     	        "passwordResetUserId",
     	        authenticationModel.getUserId());
 
+    	model.addAttribute(
+    	        "passwordResetForm",
+    	        new PasswordResetForm());
+    	
     	return "password_reset";
 
     }
diff --git a/src/main/java/com/example/demo/app/presentation/form/AuthenticationForm.java b/src/main/java/com/example/demo/app/presentation/form/AuthenticationForm.java
index 2c27a5d..65bc95d 100644
--- a/src/main/java/com/example/demo/app/presentation/form/AuthenticationForm.java
+++ b/src/main/java/com/example/demo/app/presentation/form/AuthenticationForm.java
@@ -9,6 +9,6 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public class AuthenticationForm {
     private String mailAddress;
-    private Integer secretQuestionId;
+    private Long secretQuestionId;
     private String secretAnswer;
 }