Fix inaccessible menu links returned by data producers drupal-graphql…

…#1204
sunerphey · Sep 2, 2021 · 0fe61f6 · 0fe61f6
1 parent 92d3ec4
commit 0fe61f6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/Plugin/GraphQL/DataProducer/Menu/MenuLinks.php b/src/Plugin/GraphQL/DataProducer/Menu/MenuLinks.php
@@ -91,7 +91,9 @@ public function resolve(MenuInterface $menu) {
     ];
 
     return array_filter($this->menuLinkTree->transform($tree, $manipulators), function (MenuLinkTreeElement $item) {
-      return $item->link instanceof MenuLinkInterface && $item->link->isEnabled();
+      return $item->link instanceof MenuLinkInterface
+        && $item->link->isEnabled()
+        && (!isset($item->access) || $item->access->isAllowed());
     });
   }
 

diff --git a/src/Plugin/GraphQL/DataProducer/Menu/MenuTree/MenuTreeSubtree.php b/src/Plugin/GraphQL/DataProducer/Menu/MenuTree/MenuTreeSubtree.php
@@ -36,7 +36,7 @@ class MenuTreeSubtree extends DataProducerPluginBase {
    */
   public function resolve(MenuLinkTreeElement $element) {
     return array_filter($element->subtree, function (MenuLinkTreeElement $item) {
-      return $item->link->isEnabled();
+      return $item->link->isEnabled() && (!isset($item->access) || $item->access->isAllowed());
     });
   }