Merge pull request #144 from graphql-java-kickstart/bugfix/125-voyager-context-path

oliemansm · web-flow · commit 95b764b8a02f · 2018-10-14T15:14:36.000+02:00
Add contextpath to html when serving voyager (fix #125)
diff --git a/voyager-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/voyager/boot/VoyagerController.java b/voyager-spring-boot-autoconfigure/src/main/java/com/oembedler/moon/voyager/boot/VoyagerController.java
@@ -8,6 +8,7 @@
 import org.springframework.util.StreamUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.nio.charset.Charset;
@@ -33,12 +34,13 @@ public class VoyagerController
     private String voyagerCdnVersion;
 
     @RequestMapping(value = "${voyager.mapping:/voyager}")
-    public void voyager(HttpServletResponse response) throws IOException
+    public void voyager(HttpServletRequest request, HttpServletResponse response) throws IOException
     {
+        String contextPath = request.getContextPath();
         response.setContentType("text/html; charset=UTF-8");
 
-        String voyagerCssUrl = "/vendor/voyager.css";
-        String voyagerJsUrl = "/vendor/voyager.min.js";
+        String voyagerCssUrl = contextPath + "/vendor/voyager.css";
+        String voyagerJsUrl = contextPath + "/vendor/voyager.min.js";
 
         if (voyagerCdnEnabled && StringUtils.isNotBlank(voyagerCdnVersion)) {
             voyagerCssUrl = "//apis.guru/graphql-voyager/releases/" + voyagerCdnVersion + "/voyager.css";
@@ -47,10 +49,11 @@ public void voyager(HttpServletResponse response) throws IOException
 
         String template = StreamUtils.copyToString(new ClassPathResource("voyager.html").getInputStream(), Charset.defaultCharset());
         Map<String, String> replacements = new HashMap<>();
-        replacements.put("graphqlEndpoint", graphqlEndpoint);
+        replacements.put("graphqlEndpoint", contextPath + graphqlEndpoint);
         replacements.put("pageTitle", pageTitle);
         replacements.put("voyagerCssUrl", voyagerCssUrl);
         replacements.put("voyagerJsUrl", voyagerJsUrl);
+        replacements.put("contextPath", contextPath);
 
         response.getOutputStream().write(StrSubstitutor.replace(template, replacements).getBytes(Charset.defaultCharset()));
     }
diff --git a/voyager-spring-boot-autoconfigure/src/main/resources/voyager.html b/voyager-spring-boot-autoconfigure/src/main/resources/voyager.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <script src="/vendor/react.min.js"></script>
-    <script src="/vendor/react-dom.min.js"></script>
+    <script src="${contextPath}/vendor/react.min.js"></script>
+    <script src="${contextPath}/vendor/react-dom.min.js"></script>
 
     <link rel="stylesheet" href="${voyagerCssUrl}" />
     <script src="${voyagerJsUrl}"></script>
