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

Merge remote-tracking branch 'origin/html-gruppe' into html-gruppe

Browse Source 
# Conflicts:
#	src/main/java/mops/gruppen2/controllers/Gruppen2Controller.java
This commit is contained in:
tomvahl
2020-03-06 14:32:20 +01:00
parent b499ae6c06 bdd2fc37a9
commit 5029f01ece
2 changed files with 46 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,24 +1,36 @@
package mops.gruppen2.controllers; package mops.gruppen2.controllers;
import mops.gruppen2.services.KeyCloakService;
import org.keycloak.adapters.springsecurity.token.KeycloakAuthenticationToken;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.context.annotation.SessionScope;
import javax.annotation.security.RolesAllowed; import javax.annotation.security.RolesAllowed;
import mops.gruppen2.entities.Gruppe;
import mops.gruppen2.security.Account;
import org.keycloak.KeycloakPrincipal;
import org.keycloak.adapters.springsecurity.token.KeycloakAuthenticationToken;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.context.annotation.SessionScope;
@SessionScope
@Controller @Controller
@RequestMapping("/gruppen2")
public class Gruppen2Controller { public class Gruppen2Controller {
/**
private final KeyCloakService keyCloakService; * Creates an Account.
*
public Gruppen2Controller(KeyCloakService keyCloakService) { * @param token Ein toller token
this.keyCloakService = keyCloakService; * @return Account with current userdata
*/
private Account createAccountFromPrincipal(KeycloakAuthenticationToken token) {
KeycloakPrincipal principal = (KeycloakPrincipal) token.getPrincipal();
return new Account(
principal.getName(),
principal.getKeycloakSecurityContext().getIdToken().getEmail(),
null,
principal.getKeycloakSecurityContext().getIdToken().getGivenName(),
principal.getKeycloakSecurityContext().getIdToken().getFamilyName(),
token.getAccount().getRoles());
} }
/**Zeigt die index.html an. /**Zeigt die index.html an.
@ -27,10 +39,26 @@ public class Gruppen2Controller {
* @param model tolles model * @param model tolles model
* @return index.html * @return index.html
*/ */
@GetMapping("/")
@RolesAllowed({"ROLE_orga", "ROLE_studentin", "ROLE_actuator)"}) @RolesAllowed({"ROLE_orga", "ROLE_studentin", "ROLE_actuator)"})
@GetMapping("")
public String index(KeycloakAuthenticationToken token, Model model) { public String index(KeycloakAuthenticationToken token, Model model) {
model.addAttribute("account", keyCloakService.createAccountFromPrincipal(token)); model.addAttribute("account", createAccountFromPrincipal(token));
return "index"; return "index";
} }
@PostMapping("/")
public String addGruppe(@ModelAttribute Gruppe gruppe) {
System.out.println(gruppe);
return "redirect:/";
}
@GetMapping("/createGroup")
public String createGruppe(){
return "create";
}
@GetMapping("/findGroup")
public String findGruppe(){
return "search";
}
} }

2
src/main/resources/templates/test.html → src/main/resources/templates/create.html
View File

@ -1,6 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" xmlns:th="http://www.thymeleaf.org" <html lang="en" xmlns:th="http://www.thymeleaf.org"
th:replace="~{mopslayout :: html(name='Name des Subsystems', headcontent=~{:: headcontent}, navigation=~{:: navigation}, bodycontent=~{:: bodycontent})}"> th:replace="~{mopslayout :: html(name='Gruppenbildung', headcontent=~{:: headcontent}, navigation=~{:: navigation}, bodycontent=~{:: bodycontent})}">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>Name des Subsystems</title> <title>Name des Subsystems</title>