christoph/lecture-professional-software-development
1
Fork 0
Code Activity

Merge pull request #152 from hhu-propra2/fix-no-access

Browse Source 
fix
This commit is contained in:
Christoph
2020-03-27 15:08:59 +01:00
committed by GitHub
parent 13187ccf55 8a24aee6de
commit 2b7730a3c6
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/mops/gruppen2/controller/WebController.java
View File

@ -281,8 +281,6 @@ public class WebController {
validationService.checkGroup(group.getTitle()); validationService.checkGroup(group.getTitle());
model.addAttribute("group", group); model.addAttribute("group", group);
//controllerService.addUser(keyCloakService.createAccountFromPrincipal(token), group.getId());
if (group.getVisibility() == Visibility.PUBLIC) { if (group.getVisibility() == Visibility.PUBLIC) {
return "redirect:/gruppen2/details/" + group.getId(); 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()); 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)); controllerService.addUser(keyCloakService.createAccountFromPrincipal(token), UUID.fromString(groupId));
} }

5
src/main/java/mops/gruppen2/service/ValidationService.java
View File

@ -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) { public Group checkParent(UUID parentId) {
Group parent = new Group(); Group parent = new Group();
if (!controllerService.idIsEmpty(parentId)) { if (!controllerService.idIsEmpty(parentId)) {