diff --git a/src/main/java/de/thm/arsnova/controller/UserController.java b/src/main/java/de/thm/arsnova/controller/UserController.java index a113f184a4569d881391c552f900580f4775234f..720edf81e841de1470cf58e7db797d8ac6008f4c 100644 --- a/src/main/java/de/thm/arsnova/controller/UserController.java +++ b/src/main/java/de/thm/arsnova/controller/UserController.java @@ -97,7 +97,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 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 7fba2f8ae692847dc865f325051409bf63260128..a2fb705c622c1c6e51e074a8d2bd7a6b56627edc 100644 --- a/src/main/java/de/thm/arsnova/services/UserService.java +++ b/src/main/java/de/thm/arsnova/services/UserService.java @@ -424,7 +424,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(); }