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

fixed Account

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/mops/gruppen2/controllers/Gruppen2Controller.java
View File

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