From 8a24aee6de8d341c3d93c76be53d2ff1c90c5646 Mon Sep 17 00:00:00 2001 From: Christoph Date: Fri, 27 Mar 2020 15:04:52 +0100 Subject: [PATCH] fix Co-authored-by: Christoph --- src/main/java/mops/gruppen2/controller/WebController.java | 4 +--- src/main/java/mops/gruppen2/service/ValidationService.java | 5 +++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/mops/gruppen2/controller/WebController.java b/src/main/java/mops/gruppen2/controller/WebController.java index 5a09ce9..0e1f1c6 100644 --- a/src/main/java/mops/gruppen2/controller/WebController.java +++ b/src/main/java/mops/gruppen2/controller/WebController.java @@ -281,8 +281,6 @@ public class WebController { validationService.checkGroup(group.getTitle()); model.addAttribute("group", group); - //controllerService.addUser(keyCloakService.createAccountFromPrincipal(token), group.getId()); - if (group.getVisibility() == Visibility.PUBLIC) { return "redirect:/gruppen2/details/" + group.getId(); } @@ -300,7 +298,7 @@ public class WebController { User user = new User(acc.getName(), acc.getGivenname(), acc.getFamilyname(), acc.getEmail()); - if (!validationService.checkIfUserInGroup(userService.getGroupById(UUID.fromString(groupId)), user)) { + if (!validationService.checkIfUserInGroupWithoutNoAccessAcception(userService.getGroupById(UUID.fromString(groupId)), user)) { controllerService.addUser(keyCloakService.createAccountFromPrincipal(token), UUID.fromString(groupId)); } diff --git a/src/main/java/mops/gruppen2/service/ValidationService.java b/src/main/java/mops/gruppen2/service/ValidationService.java index 94148c7..da1269b 100644 --- a/src/main/java/mops/gruppen2/service/ValidationService.java +++ b/src/main/java/mops/gruppen2/service/ValidationService.java @@ -62,6 +62,11 @@ public class ValidationService { } } + //Warum ist das überhaupt nötig smh + public boolean checkIfUserInGroupWithoutNoAccessAcception(Group group, User user) { + return group.getMembers().contains(user); + } + public Group checkParent(UUID parentId) { Group parent = new Group(); if (!controllerService.idIsEmpty(parentId)) {