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

Move Converter::parseAdditionalData to AdditionalData\Parser::toArray and defer its execution to Stage\Config::flattenContentTypeData

Author: danmooney2

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

@@ -9,7 +9,6 @@
 namespace Magento\PageBuilder\Model;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\PageBuilder\Model\Config\ContentType\Converter;
 
 class Config extends \Magento\Framework\Config\Data implements \Magento\PageBuilder\Model\Config\ConfigInterface
 {
@@ -20,27 +19,19 @@ class Config extends \Magento\Framework\Config\Data implements \Magento\PageBuil
      */
     private $scopeConfig;
 
-    /**
-     * @var Converter
-     */
-    private $converter;
-
     /**
      * @param \Magento\PageBuilder\Model\Config\CompositeReader $reader
      * @param \Magento\Framework\Config\CacheInterface $cache
      * @param ScopeConfigInterface $scopeConfig
-     * @param Converter $converter
      * @param string $cacheId
      */
     public function __construct(
         \Magento\PageBuilder\Model\Config\CompositeReader $reader,
         \Magento\Framework\Config\CacheInterface $cache,
         ScopeConfigInterface $scopeConfig,
-        Converter $converter,
         $cacheId = 'pagebuilder_config'
     ) {
         $this->scopeConfig = $scopeConfig;
-        $this->converter = $converter;
         parent::__construct($reader, $cache, $cacheId);
     }
 
@@ -59,10 +50,7 @@ public function getGroups()
      */
     public function getContentTypes(): array
     {
-        $types = $this->get('types');
-        $types = $this->converter->parseAdditionalData($types);
-
-        return $types;
+        return $this->get('types');
     }
 
     /**

app/code/Magento/PageBuilder/Model/Config/ContentType/AdditionalData/Parser.php

@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\PageBuilder\Model\Config\ContentType\AdditionalData;
+
+use Magento\Framework\Data\Argument\InterpreterInterface;
+
+/**
+ * Additional Data Parser for evaluation of data providers at runtime
+ */
+class Parser
+{
+    /**
+     * @var InterpreterInterface
+     */
+    private $argumentInterpreter;
+
+    /**
+     * @param InterpreterInterface $argumentInterpreter
+     */
+    public function __construct(
+        InterpreterInterface $argumentInterpreter
+    ) {
+        $this->argumentInterpreter = $argumentInterpreter;
+    }
+
+    /**
+     * Convert and evaluate additional data from arguments nodes to array
+     *
+     * @param array $additionalData
+     * @return array
+     */
+    public function toArray(array $additionalData): array
+    {
+        $parsedAdditionalData = [];
+
+        $convertToProviders = function ($additionalDatum) use (&$convertToProviders) {
+            $processedData = [];
+
+            foreach ($additionalDatum as $key => $value) {
+                $processedData[$key] = $value;
+
+                if (is_array($value)) {
+                    $processedData[$key] = $convertToProviders($additionalDatum[$key]);
+                } elseif (is_object($value) && $value instanceof ProviderInterface) {
+                    $processedData[$key] = $value->getData($key)[$key];
+                }
+            }
+
+            return $processedData;
+        };
+
+        foreach ($additionalData as $key => $additionalDatum) {
+            $additionalDatum = $this->argumentInterpreter->evaluate($additionalDatum);
+            $parsedAdditionalData[$key] = $convertToProviders($additionalDatum);
+        }
+
+        return $parsedAdditionalData;
+    }
+}

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

@@ -9,8 +9,6 @@
 namespace Magento\PageBuilder\Model\Config\ContentType;
 
 use Magento\Framework\ObjectManager\Config\Mapper\ArgumentParser;
-use Magento\Framework\Data\Argument\InterpreterInterface;
-use Magento\PageBuilder\Model\Config\ContentType\AdditionalData\ProviderInterface;
 
 class Converter implements \Magento\Framework\Config\ConverterInterface
 {
@@ -19,22 +17,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;
     }
 
     /**
@@ -51,44 +41,6 @@ public function convert($source): array
         ];
     }
 
-    /**
-     * Convert and evaluate additional data from arguments nodes to array
-     *
-     * @param array $types
-     * @return array
-     */
-    public function parseAdditionalData(array $types): array
-    {
-        $convertToProviders = function ($additionalDatum) use (&$convertToProviders) {
-            $processedData = [];
-
-            foreach ($additionalDatum as $key => $value) {
-                $processedData[$key] = $value;
-
-                if (is_array($value)) {
-                    $processedData[$key] = $convertToProviders($additionalDatum[$key]);
-                } elseif (is_object($value) && $value instanceof ProviderInterface) {
-                    $processedData[$key] = $value->getData($key)[$key];
-                }
-            }
-
-            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;
-    }
-
     /**
      * Convert types
      *

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

@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\PageBuilder\Model\Stage;
 
 use Magento\Framework\UrlInterface;
@@ -37,26 +40,34 @@ class Config
      */
     private $frontendUrlBuilder;
 
+    /**
+     * @var \Magento\PageBuilder\Model\Config\ContentType\AdditionalData\Parser
+     */
+    private $additionalDataParser;
+
     /**
      * Constructor
      *
      * @param \Magento\PageBuilder\Model\Config\ConfigInterface $config
      * @param Config\UiComponentConfig $uiComponentConfig
      * @param \Magento\Framework\UrlInterface $urlBuilder
      * @param \Magento\Framework\Url $frontendUrlBuilder
+     * @param \Magento\PageBuilder\Model\Config\ContentType\AdditionalData\Parser $additionalDataParser
      * @param array $data
      */
     public function __construct(
         \Magento\PageBuilder\Model\Config\ConfigInterface $config,
         Config\UiComponentConfig $uiComponentConfig,
         \Magento\Framework\UrlInterface $urlBuilder,
         \Magento\Framework\Url $frontendUrlBuilder,
+        \Magento\PageBuilder\Model\Config\ContentType\AdditionalData\Parser $additionalDataParser,
         array $data = []
     ) {
         $this->config = $config;
         $this->uiComponentConfig = $uiComponentConfig;
         $this->urlBuilder = $urlBuilder;
         $this->frontendUrlBuilder = $frontendUrlBuilder;
+        $this->additionalDataParser = $additionalDataParser;
         $this->data = $data;
     }
 
@@ -141,7 +152,9 @@ private function flattenContentTypeData($name, $contentType)
             'allowed_parents' => isset($contentType['allowed_parents']) ? $contentType['allowed_parents'] : [],
             'readers' => isset($contentType['readers']) ? $contentType['readers'] : [],
             'appearances' => isset($contentType['appearances']) ? $contentType['appearances'] : [],
-            'additional_data' => isset($contentType['additional_data']) ? $contentType['additional_data'] : [],
+            'additional_data' => isset($contentType['additional_data'])
+                ? $this->additionalDataParser->toArray($contentType['additional_data'])
+                : [],
             'data_mapping' => isset($contentType['data_mapping']) ? $contentType['data_mapping'] : [],
             'is_visible' => isset($contentType['is_visible']) && $contentType['is_visible'] === 'false' ? false : true
         ];