From 617abd9d9061adcd1eed67ebd892d1c21004b35f Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Tue, 19 Mar 2013 22:41:43 -0300 Subject: [PATCH] Change exception ... --- .../src/main/java/com/wisemapping/rest/AdminController.java | 2 +- .../main/java/com/wisemapping/security/UserDetailsService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/AdminController.java b/wise-webapp/src/main/java/com/wisemapping/rest/AdminController.java index f17ec5ff..8208ad08 100644 --- a/wise-webapp/src/main/java/com/wisemapping/rest/AdminController.java +++ b/wise-webapp/src/main/java/com/wisemapping/rest/AdminController.java @@ -105,7 +105,7 @@ public class AdminController extends BaseController { userService.changePassword(user); } - @RequestMapping(method = RequestMethod.DELETE, value = "admin/users/{id}") + @RequestMapping(method = RequestMethod.DELETE, value = "admin/users/{id}",consumes = {"text/plain"}) @ResponseStatus(value = HttpStatus.NO_CONTENT) public void getUserByEmail(@PathVariable long id) throws WiseMappingException { final User user = userService.getUserBy(id); diff --git a/wise-webapp/src/main/java/com/wisemapping/security/UserDetailsService.java b/wise-webapp/src/main/java/com/wisemapping/security/UserDetailsService.java index 0b76d215..04ca4c68 100644 --- a/wise-webapp/src/main/java/com/wisemapping/security/UserDetailsService.java +++ b/wise-webapp/src/main/java/com/wisemapping/security/UserDetailsService.java @@ -61,7 +61,7 @@ public class UserDetailsService final User result; if (dbUser != null) { if (!token.getIdentityUrl().equals(dbUser.getAuthenticatorUri())) { - throw new IllegalStateException("Identity url for this user can not change:" + token.getIdentityUrl()); + throw new UsernameNotFoundException("Identity url for this user can not change:" + token.getIdentityUrl()); } result = dbUser; } else {