MC-15977: PageBuilder preview

Author: eug123

app/code/Magento/PageBuilder/Controller/ContentType/Preview.php

@@ -26,19 +26,28 @@ class Preview extends \Magento\Framework\App\Action\Action implements HttpPostAc
      */
     private $rendererPool;
 
+    /**
+     * @var \Magento\Backend\Model\Auth
+     */
+    private $auth;
+
     /**
      * Constructor
      *
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\PageBuilder\Model\Stage\RendererPool $rendererPool
+     * @param \Magento\Backend\Model\Auth $auth
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
-        \Magento\PageBuilder\Model\Stage\RendererPool $rendererPool
+        \Magento\PageBuilder\Model\Stage\RendererPool $rendererPool,
+        \Magento\Backend\Model\Auth $auth = null
     ) {
         parent::__construct($context);
 
         $this->rendererPool = $rendererPool;
+        $this->auth = $auth ?? \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Backend\Model\Auth::class);
     }
 
     /**
@@ -48,14 +57,18 @@ public function __construct(
      */
     public function execute()
     {
-        $pageResult = $this->resultFactory->create(ResultFactory::TYPE_PAGE);
-        // Some template filters and directive processors expect this to be called in order to function.
-        $pageResult->initLayout();
+        if ($this->auth->isLoggedIn()) {
+            $pageResult = $this->resultFactory->create(ResultFactory::TYPE_PAGE);
+            // Some template filters and directive processors expect this to be called in order to function.
+            $pageResult->initLayout();
+
+            $params = $this->getRequest()->getParams();
+            $renderer = $this->rendererPool->getRenderer($params['role']);
+            $result = ['data' => $renderer->render($params)];
 
-        $params = $this->getRequest()->getParams();
-        $renderer = $this->rendererPool->getRenderer($params['role']);
-        $result = ['data' => $renderer->render($params)];
+            return $this->resultFactory->create(ResultFactory::TYPE_JSON)->setData($result);
+        }
 
-        return $this->resultFactory->create(ResultFactory::TYPE_JSON)->setData($result);
+        $this->_forward('noroute');
     }
 }

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

@@ -135,7 +135,9 @@ public function getConfig()
             'content_types' => $this->getContentTypes(),
             'stage_config' => $this->data,
             'media_url' => $this->urlBuilder->getBaseUrl(['_type' => UrlInterface::URL_TYPE_MEDIA]),
-            'preview_url' => $this->frontendUrlBuilder->getUrl('pagebuilder/contenttype/preview'),
+            'preview_url' => $this->frontendUrlBuilder
+                ->addSessionParam()
+                ->getUrl('pagebuilder/contenttype/preview'),
             'column_grid_default' => $this->scopeConfig->getValue(self::XML_PATH_COLUMN_GRID_DEFAULT),
             'column_grid_max' => $this->scopeConfig->getValue(self::XML_PATH_COLUMN_GRID_MAX),
             'can_use_inline_editing_on_stage' => $this->isWysiwygProvisionedForEditingOnStage(),

app/code/Magento/PageBuilder/Plugin/Framework/App/FrontController.php

@@ -25,23 +25,25 @@ public function __construct(
     }
 
     /**
+     * Get Sid for pagebuilder preview
+     *
      * @param \Magento\Framework\Session\SidResolver $subject
-     * @param \Closure $proceed
+     * @param string|null $result
      * @param \Magento\Framework\Session\SessionManagerInterface $session
      *
      * @return string|null
      */
-    public function aroundGetSid(
+    public function afterGetSid(
         \Magento\Framework\Session\SidResolver $subject,
-        \Closure $proceed,
+        $result,
         \Magento\Framework\Session\SessionManagerInterface $session
     ) {
-        if (strpos($this->request->getPathInfo(), 'pagebuilder/contenttype/preview')) {
+        if (strpos($this->request->getPathInfo(), 'pagebuilder/contenttype/preview') !== false) {
             return $this->request->getQuery(
                 $subject->getSessionIdQueryParam($session)
             );
         }
 
-        return $proceed($session);
+        return $result;
     }
 }

app/code/Magento/PageBuilder/Plugin/Framework/Session/SidResolver.php

@@ -140,14 +140,6 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\PageBuilder\Plugin\Framework\App\FrontController">
-        <arguments>
-            <argument name="auth" xsi:type="object">\Magento\Backend\Model\Auth\Proxy</argument>
-        </arguments>
-    </type>
-    <type name="Magento\Framework\App\FrontControllerInterface">
-        <plugin name="pagebuilder_preview_permissions_check" type="Magento\PageBuilder\Plugin\Framework\App\FrontController" />
-    </type>
     <type name="Magento\Framework\Session\SidResolver">
         <plugin name="pagebuilder_preview_sid_resolving" type="Magento\PageBuilder\Plugin\Framework\Session\SidResolver" />
     </type>