WIP

diff --git a/pwreset/src/main/java/de/juplo/demos/pwreset/adapters/in/WebController.java b/pwreset/src/main/java/de/juplo/demos/pwreset/adapters/in/WebController.java
index 79ad14e9d71e0c35a8f42773ea29ebf7aab0f852..b848ce2936153d97fcb257cd226f8a5a144d9b21 100644 (file)
--- a/pwreset/src/main/java/de/juplo/demos/pwreset/adapters/in/WebController.java
+++ b/pwreset/src/main/java/de/juplo/demos/pwreset/adapters/in/WebController.java
@@ -32,14 +32,14 @@ public class WebController
       throws
       IOException
   {
-    PasswordResetRequest resetRequest = passwordRestService.requestPasswordReset(email);
+    PasswordResetRequest resetRequest = passwordRestService.request(email);
     httpServletResponse.sendRedirect(resetRequest.getUserId().toString());
   }
 
   @GetMapping("/{id}")
   public ModelAndView getResetRequest(@PathVariable UUID id)
   {
-    PasswordResetRequest resetRequest = passwordRestService.getPasswordReset(id);
+    PasswordResetRequest resetRequest = passwordRestService.get(id);
     ModelAndView mav = new ModelAndView("confirm");
     return "confirm";
   }
@@ -57,7 +57,7 @@ public class WebController
     try
     {
       PasswordResetRequest resetRequest =
-          passwordRestService.confirmPasswordRequest(
+          passwordRestService.confirm(
               id,
               code,
               password);

diff --git a/pwreset/src/main/java/de/juplo/demos/pwreset/api/domain/PasswordResetRequest.java b/pwreset/src/main/java/de/juplo/demos/pwreset/api/domain/PasswordResetRequest.java
index a5508d8e6ed2d5c4bbfee393637f58854469c13a..d0ed22f2e8e31b56fe952e6e158d4cbcaa6c910b 100644 (file)
--- a/pwreset/src/main/java/de/juplo/demos/pwreset/api/domain/PasswordResetRequest.java
+++ b/pwreset/src/main/java/de/juplo/demos/pwreset/api/domain/PasswordResetRequest.java
@@ -2,6 +2,7 @@ package de.juplo.demos.pwreset.api.domain;
 
 import lombok.Data;
 
+import java.time.ZonedDateTime;
 import java.util.Optional;
 import java.util.UUID;
 
@@ -21,4 +22,7 @@ public class PasswordResetRequest
   private String code;
   private String password;
   private Status status;
+  private ZonedDateTime created;
+  private ZonedDateTime confirmed;
+  private ZonedDateTime accomplihed;
 }

diff --git a/pwreset/src/main/java/de/juplo/demos/pwreset/api/domain/PasswordRestService.java b/pwreset/src/main/java/de/juplo/demos/pwreset/api/domain/PasswordRestService.java
index af124c7c2dd0eba9f96bc6721bd39b1570d99cac..3eca306b5a7f9ab6f79c3ccaeeb93e17a81bc55f 100644 (file)
--- a/pwreset/src/main/java/de/juplo/demos/pwreset/api/domain/PasswordRestService.java
+++ b/pwreset/src/main/java/de/juplo/demos/pwreset/api/domain/PasswordRestService.java
@@ -5,7 +5,14 @@ import java.util.UUID;
 
 public interface PasswordRestService
 {
-  PasswordResetRequest requestPasswordReset(String email);
-  PasswordResetRequest getPasswordReset();
-  PasswordResetRequest confirmPasswordRequest(UUID requestId, String code, String password);
+  enum Progress
+  {
+    CREATED,
+    CONFIRMED,
+    ACCOMPLISHED
+  }
+
+  PasswordResetRequest request(String email);
+  PasswordResetRequest get();
+  PasswordResetRequest confirm(UUID requestId, String code, String password);
 }