diff options
| -rw-r--r-- | src/main/java/net/libertacasa/pubsh/web/WebApplication.java | 14 | ||||
| -rw-r--r-- | src/main/resources/templates/portal.html | 10 |
2 files changed, 10 insertions, 14 deletions
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<String, String> body, HttpServletRequest request) { KeycloakAuthenticationToken principal = (KeycloakAuthenticationToken) request.getUserPrincipal(); String username= null; String userid = principal.getName(); IDToken token = principal.getAccount().getKeycloakSecurityContext().getIdToken(); Map<String, Object> customClaims = token.getOtherClaims(); username = String.valueOf(customClaims.get("username")); - //String osChoice = null; - //model.addAttribute("osChoice", osChoice); - //Map<String, Object> 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"); } diff --git a/src/main/resources/templates/portal.html b/src/main/resources/templates/portal.html index 66c5ad1..836c42e 100644 --- a/src/main/resources/templates/portal.html +++ b/src/main/resources/templates/portal.html @@ -17,16 +17,16 @@ </table> <h2>Generate new throw-away shell:</h2> - <select th:field="*{availableOs}" class="form-control" th:id="osChoice" th:name="osChoice"> + <form th:object="${osChoice}" th:id="request_pseudoform" action="#" th:action="@{'/frontend/container/add'}" th:method="post" th:os="${osoption}" th:onsubmit="return confirm('You are about to generate a shell with the OS ' + this.getAttribute('os') + ' - please be patient after you confirm, as the generation may take a short while.');"> + <select class="form-control" th:object="${osChoice}" name="osChoice"> <option value="">Select operating system ...</option> <option th:each="osoption : ${availableOs}" - th:value="${osoption}" + th:value="${osoption}" + th:attr="value=${osoption}" th:text="${osoption}"></option> </select> - - <form th:object="${osChoice}" th:id="request_pseudoform" action="#" th:action="@{'/frontend/container/add'}" th:method="post" th:os="${osChoice}" th:onsubmit="return confirm('You are about to generate a shell with the OS ' + this.getAttribute('os') + ' - please be patient after you confirm, as the generation may take a short while.');"> - <input th:type="hidden" th:method="post" th:name="osChoice" th:value="osChoice" th:attr="value = ${osChoice}" /> + <p><span th:text="${osChoice}"></span></p> <button class="btn btn-primary" th:id="request_submission" th:type="submit">Generate</button> </form> |