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

fix invite

Browse Source 
Co-authored-by: Christoph <tobi@urpost.de>
This commit is contained in:
Christoph
2020-03-27 14:04:32 +01:00
parent ef00c42f6f
commit 9ccb7c77a2
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -296,7 +296,11 @@ public class WebController {
public String postAcceptInvite(KeycloakAuthenticationToken token,
@RequestParam("id") String groupId) {
controllerService.addUser(keyCloakService.createAccountFromPrincipal(token), UUID.fromString(groupId));
User user = new User(keyCloakService.createAccountFromPrincipal(token));
if (!validationService.checkIfUserInGroup(userService.getGroupById(UUID.fromString(groupId)), user)) {
controllerService.addUser(keyCloakService.createAccountFromPrincipal(token), UUID.fromString(groupId));
}
return "redirect:/gruppen2/";
}

16
src/main/java/mops/gruppen2/domain/User.java
View File

@ -4,6 +4,7 @@ import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import mops.gruppen2.security.Account;
@Getter
@AllArgsConstructor
@ -11,8 +12,15 @@ import lombok.NoArgsConstructor;
@EqualsAndHashCode(exclude = {"givenname", "familyname", "email"})
public class User {
private String id;
private String givenname;
private String familyname;
private String email;
private String id;
private String givenname;
private String familyname;
private String email;
public User(Account account) {
this.id = account.getName();
this.givenname = account.getGivenname();
this.familyname = account.getFamilyname();
this.email = account.getEmail();
}
}