fix: custom push URL, handle URL when already prefixed by `context://…

…` correctly
vaadin · Oct 5, 2020 · 7751d00 · 7751d00
1 parent 2fb59cb
commit 7751d00
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/vaadin-spring/src/main/java/com/vaadin/flow/spring/SpringServlet.java b/vaadin-spring/src/main/java/com/vaadin/flow/spring/SpringServlet.java
@@ -135,6 +135,7 @@ protected DeploymentConfiguration createDeploymentConfiguration(
             }
             final String mapping = VaadinServletConfiguration.VAADIN_SERVLET_MAPPING
                     .replace("/*", "");
+            customPushUrl = customPushUrl.replaceFirst("context://", "/");
             customPushUrl = customPushUrl.replaceFirst(Pattern.quote(mapping),
                     ""); // if workaround "/vaadinServlet/myCustomUrl" used
             customPushUrl = customPushUrl.replaceFirst("^/","");

diff --git a/vaadin-spring/src/test/java/com/vaadin/flow/spring/service/SpringServletTest.java b/vaadin-spring/src/test/java/com/vaadin/flow/spring/service/SpringServletTest.java
@@ -83,6 +83,17 @@ public void pushURL_rootMappingAndCustomURLWithPrecedingSlash_isPrefixedWithCont
                 service.getDeploymentConfiguration().getPushURL());
     }
 
+    @Test
+    public void pushURL_rootMappingAndCustomURLWithContextVaadinServletPrefix_isNotAdditionallyPrefixed()
+            throws ServletException {
+        final Properties properties = new Properties();
+        properties.setProperty("pushURL", "context://vaadinServlet/customUrl");
+        VaadinService service = SpringInstantiatorTest.getService(context,
+                properties, true);
+        Assert.assertEquals("context://vaadinServlet/customUrl",
+                service.getDeploymentConfiguration().getPushURL());
+    }
+
     @Test
     public void pushURL_rootMappingAndCustomURLWithVaadinServletPrefix_isNotAdditionallyPrefixed()
             throws ServletException {