Adjusted the server path to include the context path

sadv1r · Jun 3, 2024 · a719ba0 · a719ba0
1 parent f6489bb
commit a719ba0
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 8 deletions.
diff --git a/...sadv1r/spring/graphql/editor/graphiql/configuration/GraphiQlWebFluxAutoConfiguration.java b/...sadv1r/spring/graphql/editor/graphiql/configuration/GraphiQlWebFluxAutoConfiguration.java
@@ -24,9 +24,11 @@ public class GraphiQlWebFluxAutoConfiguration {
     @Order(-1)
     public RouterFunction<RenderingResponse> reactiveGraphiQlRouterFunction(GraphiqlProperties properties,
                                                                             @Value("${spring.graphql.path:/graphql}") String serverPath) {
+        String pathWithContext = serverPath.startsWith("/") ? serverPath : "/" + serverPath;
+
         final HandlerFunction<RenderingResponse> handler = e -> RenderingResponse.create("graphiql")
                 .modelAttribute("cdnHost", properties.getCdn().getHost())
-                .modelAttribute("serverPath", serverPath)
+                .modelAttribute("serverPath", e.requestPath().contextPath().value() + pathWithContext)
                 .modelAttribute("query", properties.getQuery())
                 .modelAttribute("defaultEditorToolsVisibility", properties.getDefaultEditorToolsVisibility())
                 .modelAttribute("variables", properties.getVariables())

diff --git a/.../sadv1r/spring/graphql/editor/graphiql/configuration/GraphiQlWebMvcAutoConfiguration.java b/.../sadv1r/spring/graphql/editor/graphiql/configuration/GraphiQlWebMvcAutoConfiguration.java
@@ -21,9 +21,11 @@ public class GraphiQlWebMvcAutoConfiguration {
     @Order(-1)
     public RouterFunction<ServerResponse> graphiQlRouterFunction(GraphiqlProperties properties,
                                                                  @Value("${spring.graphql.path:/graphql}") String serverPath) {
+        String pathWithContext = serverPath.startsWith("/") ? serverPath : "/" + serverPath;
+
         final HandlerFunction<ServerResponse> handler = e -> RenderingResponse.create("graphiql")
                 .modelAttribute("cdnHost", properties.getCdn().getHost())
-                .modelAttribute("serverPath", serverPath)
+                .modelAttribute("serverPath", e.requestPath().contextPath().value() + pathWithContext)
                 .modelAttribute("query", properties.getQuery())
                 .modelAttribute("defaultEditorToolsVisibility", properties.getDefaultEditorToolsVisibility())
                 .modelAttribute("variables", properties.getVariables())

diff --git a/...spring/graphql/editor/playground/configuration/PlaygroundWebFluxMvcAutoConfiguration.java b/...spring/graphql/editor/playground/configuration/PlaygroundWebFluxMvcAutoConfiguration.java
@@ -24,9 +24,11 @@ public class PlaygroundWebFluxMvcAutoConfiguration {
     @Order(-1)
     public RouterFunction<RenderingResponse> reactivePlaygroundRouterFunction(PlaygroundProperties properties,
                                                                               @Value("${spring.graphql.path:/graphql}") String serverPath) {
+        String pathWithContext = serverPath.startsWith("/") ? serverPath : "/" + serverPath;
+
         final HandlerFunction<RenderingResponse> handler = e -> RenderingResponse.create("playground")
                 .modelAttribute("cdnHost", properties.getCdn().getHost())
-                .modelAttribute("serverPath", serverPath)
+                .modelAttribute("serverPath", e.requestPath().contextPath().value() + pathWithContext)
                 .modelAttribute("settings", properties.getSettings())
                 .modelAttribute("headers", properties.getHeaders())
                 .modelAttribute("tabs", properties.getTabs())

diff --git a/...v1r/spring/graphql/editor/playground/configuration/PlaygroundWebMvcAutoConfiguration.java b/...v1r/spring/graphql/editor/playground/configuration/PlaygroundWebMvcAutoConfiguration.java
@@ -21,9 +21,11 @@ public class PlaygroundWebMvcAutoConfiguration {
     @Order(-1)
     public RouterFunction<ServerResponse> playgroundRouterFunction(PlaygroundProperties properties,
                                                                    @Value("${spring.graphql.path:/graphql}") String serverPath) {
+        String pathWithContext = serverPath.startsWith("/") ? serverPath : "/" + serverPath;
+
         final HandlerFunction<ServerResponse> handler = e -> RenderingResponse.create("playground")
                 .modelAttribute("cdnHost", properties.getCdn().getHost())
-                .modelAttribute("serverPath", serverPath)
+                .modelAttribute("serverPath", e.requestPath().contextPath().value() + pathWithContext)
                 .modelAttribute("settings", properties.getSettings())
                 .modelAttribute("headers", properties.getHeaders())
                 .modelAttribute("tabs", properties.getTabs())

diff --git a/...u/sadv1r/spring/graphql/editor/voyager/configuration/VoyagerWebFluxAutoConfiguration.java b/...u/sadv1r/spring/graphql/editor/voyager/configuration/VoyagerWebFluxAutoConfiguration.java
@@ -23,10 +23,12 @@ public class VoyagerWebFluxAutoConfiguration {
     @Bean
     @Order(-1)
     public RouterFunction<RenderingResponse> reactiveVoyagerRouterFunction(VoyagerProperties properties,
-                                                                            @Value("${spring.graphql.path:/graphql}") String serverPath) {
+                                                                           @Value("${spring.graphql.path:/graphql}") String serverPath) {
+        String pathWithContext = serverPath.startsWith("/") ? serverPath : "/" + serverPath;
+
         final HandlerFunction<RenderingResponse> handler = e -> RenderingResponse.create("voyager")
                 .modelAttribute("cdnHost", properties.getCdn().getHost())
-                .modelAttribute("serverPath", serverPath)
+                .modelAttribute("serverPath", e.requestPath().contextPath().value() + pathWithContext)
                 .modelAttribute("displayOptions", properties.getDisplayOptions())
                 .modelAttribute("hideDocs", properties.isHideDocs())
                 .modelAttribute("hideSettings", properties.isHideSettings())

diff --git a/...ru/sadv1r/spring/graphql/editor/voyager/configuration/VoyagerWebMvcAutoConfiguration.java b/...ru/sadv1r/spring/graphql/editor/voyager/configuration/VoyagerWebMvcAutoConfiguration.java
@@ -20,10 +20,12 @@ public class VoyagerWebMvcAutoConfiguration {
     @Bean
     @Order(-1)
     public RouterFunction<ServerResponse> voyagerRouterFunction(VoyagerProperties properties,
-                                                                 @Value("${spring.graphql.path:/graphql}") String serverPath) {
+                                                                @Value("${spring.graphql.path:/graphql}") String serverPath) {
+        String pathWithContext = serverPath.startsWith("/") ? serverPath : "/" + serverPath;
+
         final HandlerFunction<ServerResponse> handler = e -> RenderingResponse.create("voyager")
                 .modelAttribute("cdnHost", properties.getCdn().getHost())
-                .modelAttribute("serverPath", serverPath)
+                .modelAttribute("serverPath", e.requestPath().contextPath().value() + pathWithContext)
                 .modelAttribute("displayOptions", properties.getDisplayOptions())
                 .modelAttribute("hideDocs", properties.isHideDocs())
                 .modelAttribute("hideSettings", properties.isHideSettings())