fix(entity_access): Add access result as cacheable dependency (#1372)

Author: dulnan

src/Plugin/GraphQL/DataProducer/Entity/EntityAccess.php

@@ -4,6 +4,7 @@
 
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Session\AccountInterface;
+use Drupal\graphql\GraphQL\Execution\FieldContext;
 use Drupal\graphql\Plugin\GraphQL\DataProducer\DataProducerPluginBase;
 
 /**
@@ -40,10 +41,12 @@ class EntityAccess extends DataProducerPluginBase {
    * @param string $operation
    * @param \Drupal\Core\Session\AccountInterface $user
    *
-   * @return bool|\Drupal\Core\Access\AccessResultInterface
+   * @return bool
    */
-  public function resolve(EntityInterface $entity, $operation = NULL, AccountInterface $user = NULL) {
-    return $entity->access($operation ?? 'view', $user);
+  public function resolve(EntityInterface $entity, ?string $operation, ?AccountInterface $user, FieldContext $context) {
+    $result = $entity->access($operation ?? 'view', $user, TRUE);
+    $context->addCacheableDependency($result);
+    return $result->isAllowed();
   }
 
 }

tests/src/Kernel/DataProducer/EntityTest.php

@@ -3,6 +3,7 @@
 namespace Drupal\Tests\graphql\Kernel\DataProducer;
 
 use Drupal\Core\Access\AccessResult;
+use Drupal\Core\Access\AccessResultForbidden;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\Url;
@@ -298,7 +299,7 @@ public function testResolvePublished(): void {
   public function testResolveAccess(): void {
     $this->entity->expects($this->any())
       ->method('access')
-      ->willReturn(FALSE);
+      ->willReturn(new AccessResultForbidden());
 
     $this->assertFalse($this->executeDataProducer('entity_access', [
       'entity' => $this->entity,