Automatically use beforeEnterListener AccessControls if available.

vaadin · May 14, 2024 · 324171b · 324171b
1 parent 51f6b94
commit 324171b
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/flow-server/src/main/java/com/vaadin/flow/router/RouteConfiguration.java b/flow-server/src/main/java/com/vaadin/flow/router/RouteConfiguration.java
@@ -24,8 +24,10 @@
 import java.util.Optional;
 
 import com.vaadin.flow.component.Component;
+import com.vaadin.flow.component.UI;
 import com.vaadin.flow.internal.CurrentInstance;
 import com.vaadin.flow.router.internal.AbstractRouteRegistry;
+import com.vaadin.flow.router.internal.BeforeEnterHandler;
 import com.vaadin.flow.router.internal.HasUrlParameterFormat;
 import com.vaadin.flow.router.internal.PathUtil;
 import com.vaadin.flow.router.internal.RouteUtil;
@@ -537,10 +539,21 @@ private final boolean isAnnotatedParameter(
      * Get the {@link RouteData} for all accessible registered navigation
      * targets with a menu information. Access checking depends on the active
      * {@link VaadinService} and {@link VaadinRequest}.
+     * <p>
+     * Automatically adds access controls from UI if available.
      *
      * @return list of accessible menu routes available for handled registry
      */
     public List<RouteData> getRegisteredAccessibleMenuRoutes() {
+        UI ui = UI.getCurrent();
+        if (ui != null) {
+            List<BeforeEnterListener> accessControls = ui.getInternals()
+                    .getListeners(BeforeEnterHandler.class).stream()
+                    .filter(BeforeEnterListener.class::isInstance)
+                    .map(BeforeEnterListener.class::cast).toList();
+            return getRegisteredAccessibleMenuRoutes(accessControls);
+        }
+
         return getRegisteredAccessibleMenuRoutes(Collections.emptyList());
     }