diff --git a/src/main/java/de/thm/arsnova/controller/UserController.java b/src/main/java/de/thm/arsnova/controller/UserController.java index 0c5e2403e0048d3312c182c33d0d1ad759ab9282..b56e6f9b20c08f1476391990f3cd34bd28d58a6b 100644 --- a/src/main/java/de/thm/arsnova/controller/UserController.java +++ b/src/main/java/de/thm/arsnova/controller/UserController.java @@ -94,7 +94,7 @@ public class UserController extends AbstractController { response.setStatus(HttpServletResponse.SC_BAD_REQUEST); } - @RequestMapping(value = { "/{username}" }, method = RequestMethod.DELETE) + @RequestMapping(value = { "/{username}/" }, method = RequestMethod.DELETE) public final void activate( @PathVariable final String username, final HttpServletRequest request, diff --git a/src/main/java/de/thm/arsnova/services/UserService.java b/src/main/java/de/thm/arsnova/services/UserService.java index 6ea5398051859444da664560c7b78e94c46902b7..222991cc7be284f5cea1bc3123d06754ac397d2e 100644 --- a/src/main/java/de/thm/arsnova/services/UserService.java +++ b/src/main/java/de/thm/arsnova/services/UserService.java @@ -425,7 +425,7 @@ public class UserService implements IUserService { public DbUser deleteDbUser(String username) { User user = getCurrentUser(); if (!user.getUsername().equals(username) - && SecurityContextHolder.getContext().getAuthentication().getAuthorities() + && !SecurityContextHolder.getContext().getAuthentication().getAuthorities() .contains(new SimpleGrantedAuthority("ROLE_ADMIN"))) { throw new UnauthorizedException(); }