projects
/
demos
/
pact
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
WIP
[demos/pact]
/
pwreset
/
src
/
main
/
java
/
de
/
juplo
/
demos
/
pwreset
/
adapters
/
in
/
WebController.java
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
b848ce2
..
b535a27
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
@@
-1,6
+1,6
@@
package de.juplo.demos.pwreset.adapters.in;
package de.juplo.demos.pwreset.adapters.in;
-import de.juplo.demos.pwreset.api.domain.PasswordResetRequest;
+import de.juplo.demos.pwreset.api.domain.PasswordResetRequest
Progress
;
import de.juplo.demos.pwreset.api.domain.PasswordRestService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Controller;
import de.juplo.demos.pwreset.api.domain.PasswordRestService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Controller;
@@
-20,52
+20,68
@@
public class WebController
@GetMapping("/")
@GetMapping("/")
- public String
requestForm
()
+ public String
welcome
()
{
return "request";
}
@PostMapping("/")
{
return "request";
}
@PostMapping("/")
- public void
r
esetRequest(
+ public void
createR
esetRequest(
@RequestParam String email,
HttpServletResponse httpServletResponse)
throws
IOException
{
@RequestParam String email,
HttpServletResponse httpServletResponse)
throws
IOException
{
- PasswordResetRequest
resetRequest
= passwordRestService.request(email);
- httpServletResponse.sendRedirect(
resetRequest.getUser
Id().toString());
+ PasswordResetRequest
Progress progress
= passwordRestService.request(email);
+ httpServletResponse.sendRedirect(
progress.getRequest
Id().toString());
}
@GetMapping("/{id}")
public ModelAndView getResetRequest(@PathVariable UUID id)
{
}
@GetMapping("/{id}")
public ModelAndView getResetRequest(@PathVariable UUID id)
{
- PasswordResetRequest resetRequest = passwordRestService.get(id);
- ModelAndView mav = new ModelAndView("confirm");
- return "confirm";
+ PasswordResetRequestProgress progress = passwordRestService.get(id);
+ return createModelAndView(progress);
}
}
- @PutMapping("/{id")
+ @PutMapping("/{id
}
")
public ModelAndView confirmResetRequest(
@PathVariable UUID id,
@RequestParam String code,
@RequestParam String password)
{
public ModelAndView confirmResetRequest(
@PathVariable UUID id,
@RequestParam String code,
@RequestParam String password)
{
- ModelAndView mav = new ModelAndView("confirm");
+ PasswordResetRequestProgress progress =
+ passwordRestService.confirm(
+ id,
+ code,
+ password);
+
+ ModelAndView mav = createModelAndView(progress);
+
mav.addObject("code", code);
mav.addObject("password", password);
mav.addObject("code", code);
mav.addObject("password", password);
- try
- {
- PasswordResetRequest resetRequest =
- passwordRestService.confirm(
- id,
- code,
-
password
);
+ return mav;
+ }
+
+ ModelAndView createModelAndView(PasswordResetRequestProgress progress)
+ {
+ ModelAndView mav = new ModelAndView();
+
mav.addObject("progress", progress
);
+ if (progress.isAccepted())
+ {
+ if (progress.getConfirmed().isEmpty())
+ {
+ mav.setViewName("confirm");
+ }
+ else
+ {
+ mav.setViewName("confirmed");
+ }
}
}
- catch (Exception e)
+ else
{
{
- mav.
addObject("message", e.getMessage()
);
+ mav.
setViewName("denied"
);
}
return mav;
}
return mav;