diff --git a/src/main/java/mops/gruppen2/config/Gruppen2Config.java b/src/main/java/mops/gruppen2/config/Gruppen2Config.java index 4b60fa5..6f44779 100644 --- a/src/main/java/mops/gruppen2/config/Gruppen2Config.java +++ b/src/main/java/mops/gruppen2/config/Gruppen2Config.java @@ -8,8 +8,11 @@ import org.springframework.context.annotation.Configuration; @Configuration public class Gruppen2Config { - @Autowired - GroupService groupService; - @Autowired - EventService eventService; + final GroupService groupService; + final EventService eventService; + + public Gruppen2Config(GroupService groupService, EventService eventService) { + this.groupService = groupService; + this.eventService = eventService; + } } diff --git a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java index bc8ef88..8406175 100644 --- a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java +++ b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java @@ -43,15 +43,15 @@ public class Gruppen2Controller { private final UserService userService; private final ControllerService controllerService; private final InviteLinkRepositoryService inviteLinkRepositoryService; - @Autowired - Gruppen2Config gruppen2Config; + private final Gruppen2Config gruppen2Config; - public Gruppen2Controller(KeyCloakService keyCloakService, GroupService groupService, UserService userService, ControllerService controllerService, InviteLinkRepositoryService inviteLinkRepositoryService) { + public Gruppen2Controller(KeyCloakService keyCloakService, GroupService groupService, UserService userService, ControllerService controllerService, InviteLinkRepositoryService inviteLinkRepositoryService, Gruppen2Config gruppen2Config) { this.keyCloakService = keyCloakService; this.groupService = groupService; this.userService = userService; this.controllerService = controllerService; this.inviteLinkRepositoryService = inviteLinkRepositoryService; + this.gruppen2Config = gruppen2Config; } /** @@ -258,6 +258,10 @@ public class Gruppen2Controller { public String pDeleteGroup(KeycloakAuthenticationToken token, @RequestParam("group_id") Long groupId){ Account account = keyCloakService.createAccountFromPrincipal(token); User user = new User(account.getName(), account.getGivenname(), account.getFamilyname(), account.getEmail()); + Group group = userService.getGroupById(groupId); + if(group.getRoles().get(user.getId()) != Role.ADMIN ){ + return "error"; + } controllerService.deleteGroupEvent(user.getId(), groupId); return "redirect:/gruppen2/"; } diff --git a/src/main/resources/templates/detailsMember.html b/src/main/resources/templates/detailsMember.html index 157649a..3a6ca19 100644 --- a/src/main/resources/templates/detailsMember.html +++ b/src/main/resources/templates/detailsMember.html @@ -61,7 +61,7 @@