mirror of
https://bitbucket.org/wisemapping/wisemapping-open-source.git
synced 2024-09-12 07:10:07 +02:00
Change exception ...
This commit is contained in:
parent
c2e74cb2d4
commit
617abd9d90
@ -105,7 +105,7 @@ public class AdminController extends BaseController {
|
|||||||
userService.changePassword(user);
|
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)
|
@ResponseStatus(value = HttpStatus.NO_CONTENT)
|
||||||
public void getUserByEmail(@PathVariable long id) throws WiseMappingException {
|
public void getUserByEmail(@PathVariable long id) throws WiseMappingException {
|
||||||
final User user = userService.getUserBy(id);
|
final User user = userService.getUserBy(id);
|
||||||
|
@ -61,7 +61,7 @@ public class UserDetailsService
|
|||||||
final User result;
|
final User result;
|
||||||
if (dbUser != null) {
|
if (dbUser != null) {
|
||||||
if (!token.getIdentityUrl().equals(dbUser.getAuthenticatorUri())) {
|
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;
|
result = dbUser;
|
||||||
} else {
|
} else {
|
||||||
|
Loading…
Reference in New Issue
Block a user