From 446dcaf1f70cd9c47a31c2e0b7db385d5dd4cd70 Mon Sep 17 00:00:00 2001 From: Matija Obreza Date: Thu, 27 Mar 2014 13:25:40 +0100 Subject: [PATCH] User profile controller uses updated token verification service --- .../service/impl/TokenVerificationServiceImpl.java | 2 +- .../servlet/controller/UserProfileController.java | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/genesys2/server/service/impl/TokenVerificationServiceImpl.java b/src/main/java/org/genesys2/server/service/impl/TokenVerificationServiceImpl.java index 549de8630..b61c1bce6 100644 --- a/src/main/java/org/genesys2/server/service/impl/TokenVerificationServiceImpl.java +++ b/src/main/java/org/genesys2/server/service/impl/TokenVerificationServiceImpl.java @@ -70,7 +70,7 @@ public class TokenVerificationServiceImpl implements TokenVerificationService { } if (!verificationToken.getKey().equals(key)) { - LOG.error("Email verification key invalid for token=" + verificationToken.getUuid() + " providedKey=" + key); + LOG.error("Verification key invalid for token=" + verificationToken.getUuid() + " providedKey=" + key); throw new NoSuchVerificationTokenException(); } diff --git a/src/main/java/org/genesys2/server/servlet/controller/UserProfileController.java b/src/main/java/org/genesys2/server/servlet/controller/UserProfileController.java index 39d52f9f9..14d1c8010 100644 --- a/src/main/java/org/genesys2/server/servlet/controller/UserProfileController.java +++ b/src/main/java/org/genesys2/server/servlet/controller/UserProfileController.java @@ -24,6 +24,7 @@ import org.genesys2.server.model.impl.User; import org.genesys2.server.service.ContentService; import org.genesys2.server.service.EMailVerificationService; import org.genesys2.server.service.TeamService; +import org.genesys2.server.service.TokenVerificationService.NoSuchVerificationTokenException; import org.genesys2.server.service.UserService; import org.genesys2.spring.ResourceNotFoundException; import org.springframework.beans.factory.annotation.Autowired; @@ -135,10 +136,10 @@ public class UserProfileController extends BaseController { @RequestMapping(value = "/{tokenUuid:.+}/validate", method = RequestMethod.POST) public String validateEmail2(ModelMap model, @PathVariable("tokenUuid") String tokenUuid, @RequestParam(value = "key", required = true) String key) { - - if (emailVerificationService.validateEMail(tokenUuid, key)) { + try { + emailVerificationService.validateEMail(tokenUuid, key); return "redirect:/profile"; - } else { + } catch (NoSuchVerificationTokenException e) { // Not valid model.addAttribute("tokenUuid", tokenUuid); model.addAttribute("error", "error"); @@ -167,9 +168,10 @@ public class UserProfileController extends BaseController { public String updatePassword(ModelMap model, @PathVariable("tokenUuid") String tokenUuid, @RequestParam(value = "key", required = true) String key, @RequestParam("password") String password) throws UserException { - if (emailVerificationService.changePassword(tokenUuid, key, password)) { + try { + emailVerificationService.changePassword(tokenUuid, key, password); return "redirect:/content/user.password-reset"; - } else { + } catch (NoSuchVerificationTokenException e) { // Not valid model.addAttribute("tokenUuid", tokenUuid); model.addAttribute("error", "error"); -- GitLab