MAGETWO-90864: Media Gallery content is not showing when secure keys are enabled

Evaluate additional data during every runtime and prevent its value from being cached

Author: danmooney2

app/code/Magento/PageBuilder/Model/Config.php

@@ -3,14 +3,24 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\PageBuilder\Model;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Data\Argument\InterpreterInterface;
+use Magento\PageBuilder\Model\Config\ContentType\AdditionalData\ProviderInterface;
 
 class Config extends \Magento\Framework\Config\Data implements \Magento\PageBuilder\Model\Config\ConfigInterface
 {
     const IS_PAGEBUILDER_ENABLED = 'cms/pagebuilder/enabled';
 
+    /**
+     * @var InterpreterInterface
+     */
+    private $argumentInterpreter;
+
     /**
      * @var ScopeConfigInterface
      */
@@ -20,15 +30,18 @@ class Config extends \Magento\Framework\Config\Data implements \Magento\PageBuil
      * @param \Magento\PageBuilder\Model\Config\CompositeReader $reader
      * @param \Magento\Framework\Config\CacheInterface $cache
      * @param ScopeConfigInterface $scopeConfig
+     * @param InterpreterInterface $argumentInterpreter
      * @param string $cacheId
      */
     public function __construct(
         \Magento\PageBuilder\Model\Config\CompositeReader $reader,
         \Magento\Framework\Config\CacheInterface $cache,
         ScopeConfigInterface $scopeConfig,
+        InterpreterInterface $argumentInterpreter,
         $cacheId = 'pagebuilder_config'
     ) {
         $this->scopeConfig = $scopeConfig;
+        $this->argumentInterpreter = $argumentInterpreter;
         parent::__construct($reader, $cache, $cacheId);
     }
 
@@ -43,22 +56,63 @@ public function getGroups()
     /**
      * Return all content types
      *
-     * @return array|mixed|null
+     * @return array
      */
-    public function getContentTypes()
+    public function getContentTypes(): array
     {
-        return $this->get('types');
+        $types = $this->get('types');
+        $types = $this->parseAdditionalData($types);
+
+        return $types;
     }
 
     /**
      * Returns config setting if page builder enabled
      *
      * @return bool
      */
-    public function isEnabled()
+    public function isEnabled(): bool
     {
         return (bool)$this->scopeConfig->getValue(
             \Magento\PageBuilder\Model\Config::IS_PAGEBUILDER_ENABLED
         );
     }
+
+    /**
+     * Convert and evaluate additional data from arguments nodes to array
+     *
+     * @param array $types
+     * @return array
+     */
+    private function parseAdditionalData(array $types): array
+    {
+        $convertToProviders = function ($additionalDatum) use (&$convertToProviders) {
+            $processedData = [];
+
+            foreach ($additionalDatum as $key => $value) {
+                if (is_array($value)) {
+                    $processedData[$key] = $convertToProviders($additionalDatum[$key]);
+                } elseif (is_object($value) && $value instanceof ProviderInterface) {
+                    $processedData[$key] = $value->getData($key)[$key];
+                } else {
+                    $processedData[$key] = $value;
+                }
+            }
+
+            return $processedData;
+        };
+
+        foreach ($types as &$type) {
+            if (!isset($type['additional_data'])) {
+                continue;
+            }
+
+            foreach ($type['additional_data'] as &$additionalDatum) {
+                $additionalDatum = $this->argumentInterpreter->evaluate($additionalDatum);
+                $additionalDatum = $convertToProviders($additionalDatum);
+            }
+        }
+
+        return $types;
+    }
 }

app/code/Magento/PageBuilder/Model/Config/ContentType/Converter.php

@@ -19,22 +19,14 @@ class Converter implements \Magento\Framework\Config\ConverterInterface
      */
     private $parser;
 
-    /**
-     * @var InterpreterInterface
-     */
-    private $argumentInterpreter;
-
     /**
      * Converter constructor.
      * @param ArgumentParser $parser
-     * @param InterpreterInterface $argumentInterpreter
      */
     public function __construct(
-        ArgumentParser $parser,
-        InterpreterInterface $argumentInterpreter
+        ArgumentParser $parser
     ) {
         $this->parser = $parser;
-        $this->argumentInterpreter = $argumentInterpreter;
     }
 
     /**
@@ -247,15 +239,17 @@ private function convertAdditionalData(\DOMElement $elementNode): array
         if (!$xmlArgumentsNodes->length) {
             return $additionalData;
         }
-        $typeArguments = [];
+
         /** @var $xmlArgumentsNode \DOMElement */
         foreach ($xmlArgumentsNodes as $xmlArgumentsNode) {
             $parsedArgumentsData = $this->parser->parse($xmlArgumentsNode);
             $argumentName = $xmlArgumentsNode->attributes->getNamedItem('name')->nodeValue;
-            $typeArguments[$argumentName] = $this->argumentInterpreter->evaluate(
-                $parsedArgumentsData
-            );
-            $additionalData += $this->toArray($typeArguments);
+
+            if (!isset($additionalData[$argumentName])) {
+                $additionalData[$argumentName] = [];
+            }
+
+            $additionalData[$argumentName] += $parsedArgumentsData;
         }
 
         return $additionalData;
@@ -465,25 +459,4 @@ private function getAttributeValue(\DOMElement $attributeNode, $attributeName)
             ? $attributeNode->attributes->getNamedItem($attributeName)->nodeValue
             : null;
     }
-
-    /**
-     * Convert arguments node from additional data to array
-     * @param array $typeArguments
-     * @return array
-     */
-    private function toArray(array $typeArguments)
-    {
-        $processedData = [];
-        foreach ($typeArguments as $key => $value) {
-            if (is_array($value)) {
-                $processedData[$key] = $this->toArray($typeArguments[$key]);
-            } elseif (is_object($value) && $value instanceof ProviderInterface) {
-                $processedData[$key] = $value->getData($key)[$key];
-            } else {
-                $processedData[$key] = $value;
-            }
-        }
-
-        return $processedData;
-    }
 }