1

fixed Account

This commit is contained in:
Mahgs
2020-03-04 16:29:01 +01:00
parent 724ed2d85f
commit dabe3bedc5
2 changed files with 5 additions and 6 deletions

View File

@ -1,10 +1,10 @@
package mops.gruppen2.controllers; package mops.gruppen2.controllers;
import javax.annotation.security.RolesAllowed; import javax.annotation.security.RolesAllowed;
import mops.gruppen2.security.Account; import mops.gruppen2.security.Account;
import org.keycloak.KeycloakPrincipal; import org.keycloak.KeycloakPrincipal;
import org.keycloak.adapters.springsecurity.token.KeycloakAuthenticationToken; import org.keycloak.adapters.springsecurity.token.KeycloakAuthenticationToken;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
@ -24,23 +24,21 @@ public class Gruppen2Controller {
return new Account( return new Account(
principal.getName(), principal.getName(),
principal.getKeycloakSecurityContext().getIdToken().getEmail(), principal.getKeycloakSecurityContext().getIdToken().getEmail(),
null,
principal.getKeycloakSecurityContext().getIdToken().getGivenName(), principal.getKeycloakSecurityContext().getIdToken().getGivenName(),
principal.getKeycloakSecurityContext().getIdToken().getFamilyName(), principal.getKeycloakSecurityContext().getIdToken().getFamilyName(),
token.getAccount().getRoles()); token.getAccount().getRoles());
} }
/** /**
*
* @param token * @param token
* @param model * @param model
* @return index.html * @return index.html
*/ */
@GetMapping("/") @GetMapping("/")
@RolesAllowed({"ROLE_Orga", "ROLE_studentin", "ROLE_actuator)"}) @RolesAllowed({"ROLE_orga", "ROLE_studentin", "ROLE_actuator)"})
public String index(KeycloakAuthenticationToken token, Model model) { public String index(KeycloakAuthenticationToken token, Model model) {
if (token != null) { model.addAttribute("account", createAccountFromPrincipal(token));
model.addAttribute("account", createAccountFromPrincipal(token));
}
return "index"; return "index";
} }
} }

View File

@ -9,6 +9,7 @@ import lombok.Getter;
public class Account { public class Account {
private final String name; private final String name;
private final String email; private final String email;
private final String image;
private final String givenname; private final String givenname;
private final String familyname; private final String familyname;
private final Set<String> roles; private final Set<String> roles;