Adjust caching for embargo and related access control.

discoverygarden · May 9, 2024 · 63d0178 · 63d0178
1 parent b54b44a
commit 63d0178
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/src/Access/EmbargoAccessCheck.php b/src/Access/EmbargoAccessCheck.php
@@ -74,6 +74,10 @@ public function access(EntityInterface $entity, AccountInterface $user) {
       )->render()
     );
     array_map([$state, 'addCacheableDependency'], $embargoes);
+
+    $type = $this->entityTypeManager->getDefinition('embargo');
+    $state->addCacheTags($type->getListCacheTags())
+      ->addCacheContexts($type->getListCacheContexts());
     return $state;
   }
 

diff --git a/src/Entity/Embargo.php b/src/Entity/Embargo.php
@@ -42,7 +42,8 @@
  *       "html" = "Drupal\Core\Entity\Routing\AdminHtmlRouteProvider"
  *     },
  *   },
- *   list_cache_tags = { "node_list", "media_list", "file_list" },
+ *   list_cache_contexts = { "ip.embargo_range", "user" },
+ *   list_cache_tags = { "embargo_list" },
  *   base_table = "embargo",
  *   admin_permission = "administer embargo",
  *   entity_keys = {
@@ -450,4 +451,18 @@ public function ipIsExempt(string $ip): bool {
     return $exempt_ips && $exempt_ips->withinRanges($ip);
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function getListCacheTagsToInvalidate() : array {
+    return array_merge(
+      parent::getListCacheTagsToInvalidate(),
+      [
+        'node_list',
+        'media_list',
+        'file_list',
+      ]
+    );
+  }
+
 }