SecureVaadinRequestCache no longer ignores urlMapping

Author: AB-xdev

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.1.1
+* Vaadin
+  * `SecureVaadinRequestCache` no longer ignores `urlMapping`
+
 # 2.1.0
 * Renamed `OAuth2AuthenticationTokenUtil` -> `OAuth2AuthenticationTokenExtractor`
 * Updated dependencies

vaadin/src/main/java/software/xdev/sse/vaadin/SecureVaadinRequestCache.java

@@ -38,6 +38,7 @@
 import com.vaadin.flow.router.RouteBaseData;
 import com.vaadin.flow.server.VaadinServlet;
 import com.vaadin.flow.server.VaadinServletService;
+import com.vaadin.flow.spring.security.RequestUtil;
 import com.vaadin.flow.spring.security.VaadinDefaultRequestCache;
 
 
@@ -56,6 +57,9 @@ public class SecureVaadinRequestCache extends VaadinDefaultRequestCache
 	@Autowired
 	protected ServletContext context;
 
+	@Autowired
+	protected RequestUtil requestUtil;
+	
 	// Shortcut to save computation cost (no path is longer than this)
 	protected int defaultPathMaxLength = 255;
 	protected int defaultWildcardPathLengthAssumption = 48;
@@ -154,8 +158,8 @@ protected synchronized void initAllowedPaths()
 			.stream()
 			.map(RouteBaseData::getTemplate)
 			.filter(s -> !s.isBlank())
+			.map(this.requestUtil::applyUrlMapping)
 			.map(this::handleUrlParameterInPath)
-			.map(s -> "/" + s)
 			.collect(Collectors.toSet());
 
 		LOG.debug("Allowed paths: {}", allowedPaths);