Commit 3dfae110 authored by Viacheslav Pavlov's avatar Viacheslav Pavlov Committed by Matija Obreza

Account email validation

- changed onEmailValidated redirect url
- changed validateemail.jsp "key" field to use jstl for input value
- added account-email-validated article
- changed liquibase article generation to auto.createContent
parent 41f2b41e
...@@ -175,7 +175,7 @@ public class UserProfileController extends BaseController { ...@@ -175,7 +175,7 @@ public class UserProfileController extends BaseController {
public String validateEmail2(ModelMap model, @PathVariable("tokenUuid") String tokenUuid, @RequestParam(value = "key", required = true) String key) { public String validateEmail2(ModelMap model, @PathVariable("tokenUuid") String tokenUuid, @RequestParam(value = "key", required = true) String key) {
try { try {
emailVerificationService.validateEMail(tokenUuid, key); emailVerificationService.validateEMail(tokenUuid, key);
return "redirect:/profile"; return "redirect:/content/account-email-validated";
} catch (final NoSuchVerificationTokenException | TokenExpiredException e) { } catch (final NoSuchVerificationTokenException | TokenExpiredException e) {
// Not valid // Not valid
model.addAttribute("tokenUuid", tokenUuid); model.addAttribute("tokenUuid", tokenUuid);
......
{
"en": {
"title": "Your email is verified",
"body": "Your email is verified, welcome to Genesys."
}
}
\ No newline at end of file
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<form role="form" class="form-vertical validate" action="<c:url value="/profile/${tokenUuid}/validate" />" method="post"> <form role="form" class="form-vertical validate" action="<c:url value="/profile/${tokenUuid}/validate" />" method="post">
<div class="col-lg-3"> <div class="col-lg-3">
<input type="text" id="key" name="key" class="span1 form-control" maxlength="4"/> <input value='<c:out value="${param.key}" />' type="text" id="key" name="key" class="span1 form-control" maxlength="4"/>
</div> </div>
<div class="col-lg-3"> <div class="col-lg-3">
<input type="submit" value="OK" class="btn btn-primary"/> <input type="submit" value="OK" class="btn btn-primary"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment