From e37ec4083a8fff705185956bb8fa3b29f3c05ff8 Mon Sep 17 00:00:00 2001 From: Georg Pfuetzenreuter Date: Sat, 7 May 2022 14:12:55 +0200 Subject: Checkpoint: Working OS-picker Signed-off-by: Georg Pfuetzenreuter --- .../java/net/libertacasa/pubsh/web/WebApplication.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'src/main/java/net') diff --git a/src/main/java/net/libertacasa/pubsh/web/WebApplication.java b/src/main/java/net/libertacasa/pubsh/web/WebApplication.java index 9d64592..e7b3cd2 100644 --- a/src/main/java/net/libertacasa/pubsh/web/WebApplication.java +++ b/src/main/java/net/libertacasa/pubsh/web/WebApplication.java @@ -16,9 +16,11 @@ import org.keycloak.adapters.springsecurity.token.KeycloakAuthenticationToken; import org.keycloak.representations.IDToken; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.http.MediaType; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; +import org.springframework.util.MultiValueMap; import org.springframework.web.bind.annotation.DeleteMapping; //import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; @@ -118,20 +120,15 @@ public class WebApplication { return("redirect:/portal"); } - @PostMapping("/frontend/container/add") - //public static String addContainer(@PathVariable HttpServletRequest request, Model model) { - public static String addContainer(@RequestBody String osChoice, Model model,HttpServletRequest request) { + @PostMapping(path="/frontend/container/add",consumes=MediaType.APPLICATION_FORM_URLENCODED_VALUE) + public static String addContainer(@RequestBody MultiValueMap body, HttpServletRequest request) { KeycloakAuthenticationToken principal = (KeycloakAuthenticationToken) request.getUserPrincipal(); String username= null; String userid = principal.getName(); IDToken token = principal.getAccount().getKeycloakSecurityContext().getIdToken(); Map customClaims = token.getOtherClaims(); username = String.valueOf(customClaims.get("username")); - //String osChoice = null; - //model.addAttribute("osChoice", osChoice); - //Map allAttributes = null; - //model.addAllAttributes(allAttributes); - //System.out.println(allAttributes); + String osChoice = (String) body.getFirst("osChoice"); System.out.printf("New container with OS %s requested by %s (%s)", osChoice, userid, username); @@ -141,7 +138,6 @@ public class WebApplication { //Docker.buildImage(username, osChoice, count); - return("redirect:/portal"); } -- cgit v1.2.3