Merge pull request #907 from UN-OCHA/berliner/improve-content-caching

Don't use cookies and headers when building cache keys for remote content

Author: berliner

html/modules/custom/ghi_content/ghi_content.module

@@ -189,7 +189,7 @@ function ghi_content_form_ghi_subpages_admin_views_form_alter(array &$form, Form
 /**
  * Implements hook_form_FORM_ID_alter().
  *
- * Used to disable fields that automatically populated.
+ * Used to disable fields that are automatically populated.
  */
 function ghi_content_form_node_article_edit_form_alter(array &$form, FormStateInterface $form_state) {
   /** @var \Drupal\ghi_content\ContentManager\ArticleManager $article_manager */
@@ -201,7 +201,7 @@ function ghi_content_form_node_article_edit_form_alter(array &$form, FormStateIn
 /**
  * Implements hook_form_FORM_ID_alter().
  *
- * Used to disable fields that automatically populated.
+ * Used to disable fields that are automatically populated.
  */
 function ghi_content_form_node_document_edit_form_alter(array &$form, FormStateInterface $form_state) {
   /** @var \Drupal\ghi_content\ContentManager\DocumentManager $article_manager */

html/modules/custom/ghi_content/src/Plugin/Block/Paragraph.php

@@ -429,6 +429,7 @@ public function getArticle() {
     }
     /** @var \Drupal\ghi_content\RemoteSource\RemoteSourceManager $remote_source_manager */
     $remote_source_manager = \Drupal::service('plugin.manager.remote_source');
+    /** @var \Drupal\ghi_content\RemoteSource\RemoteSourceInterface $remote_source */
     $remote_source = $remote_source_manager->createInstance($remote_source_key);
     $article_id = $conf['article_select']['article']['article_id'] ?? NULL;
     if (!$remote_source || !$article_id) {

html/modules/custom/ghi_content/src/RemoteSource/RemoteSourceBaseHpcContentModule.php

@@ -230,7 +230,7 @@ public function query($payload) {
     ];
 
     // See if we have a cached version already for this request.
-    $cache_key = $this->getCacheKey(['url' => $this->getRemoteEndpointUrl()] + $post_args);
+    $cache_key = $this->getCacheKey(['url' => $this->getRemoteEndpointUrl()] + ['body' => $post_args['body']]);
     if (!$this->disableCache && $response = $this->cache($cache_key)) {
       // If we have a cached version, use that.
       return $response;