MC-15977: PageBuilder preview

Author: eug123

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

@@ -10,7 +10,6 @@
 
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\App\Action\HttpPostActionInterface;
-use Magento\Framework\Exception\AuthenticationException;
 
 /**
  * Preview controller to render blocks preview on Stage
@@ -27,40 +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\Backend\Model\Auth $auth
+        \Magento\PageBuilder\Model\Stage\RendererPool $rendererPool
     ) {
         parent::__construct($context);
 
         $this->rendererPool = $rendererPool;
-        $this->auth = $auth;
     }
 
     /**
      * Generates an HTML preview for the stage
      *
      * @return \Magento\Framework\Controller\ResultInterface
-     * @throws \Magento\Framework\Exception\AuthenticationException
      */
     public function execute()
     {
-        if (!$this->auth->isLoggedIn()) {
-            throw new AuthenticationException(__('An authentication error occurred. Verify and try again.'));
-        }
         $pageResult = $this->resultFactory->create(ResultFactory::TYPE_PAGE);
         // Some template filters and directive processors expect this to be called in order to function.
         $pageResult->initLayout();

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

@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\PageBuilder\Plugin\Framework\App;
+
+/**
+ * Plugin for front controller interface.
+ */
+class FrontController
+{
+    /**
+     * @var \Magento\Backend\Model\Auth
+     */
+    private $auth;
+
+    /**
+     * @param \Magento\Backend\Model\Auth $auth
+     */
+    public function __construct(
+        \Magento\Backend\Model\Auth $auth
+    ) {
+        $this->auth = $auth;
+    }
+
+    /**
+     * Check if user logged in
+     *
+     * @param \Magento\Framework\App\FrontControllerInterface $subject
+     * @param \Magento\Framework\App\RequestInterface $request
+     *
+     * @return void
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function beforeDispatch(
+        \Magento\Framework\App\FrontControllerInterface $subject,
+        \Magento\Framework\App\RequestInterface $request
+    ) {
+        if (strpos($request->getPathInfo(), 'pagebuilder/contenttype/preview')) {
+            if ($this->auth->getUser()) {
+                $this->auth->getUser()->reload();
+
+                $isLoggedIn = $this->auth->isLoggedIn();
+
+                if (!$isLoggedIn) {
+                    $this->forwardRequest($request);
+                }
+            } else {
+                $this->forwardRequest($request);
+            }
+        }
+    }
+
+    /**
+     * Forwards request to the 404 page.
+     *
+     * @param \Magento\Framework\App\RequestInterface $request
+     *
+     * @return void
+     */
+    private function forwardRequest(
+        \Magento\Framework\App\RequestInterface $request
+    ) {
+        $request->initForward();
+        $request->setActionName('noroute');
+    }
+}

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

@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\PageBuilder\Plugin\Framework\Session;
+
+/**
+ * Plugin for SID resolver.
+ */
+class SidResolver
+{
+    /**
+     * @var \Magento\Framework\App\RequestInterface
+     */
+    private $request;
+
+    /**
+     * @param \Magento\Framework\App\RequestInterface $request
+     */
+    public function __construct(
+        \Magento\Framework\App\RequestInterface $request
+    ) {
+        $this->request = $request;
+    }
+
+    /**
+     * @param \Magento\Framework\Session\SidResolver $subject
+     * @param \Closure $proceed
+     * @param \Magento\Framework\Session\SessionManagerInterface $session
+     *
+     * @return string|null
+     */
+    public function aroundGetSid(
+        \Magento\Framework\Session\SidResolver $subject,
+        \Closure $proceed,
+        \Magento\Framework\Session\SessionManagerInterface $session
+    ) {
+        if (strpos($this->request->getPathInfo(), 'pagebuilder/contenttype/preview')) {
+            return $this->request->getQuery(
+                $subject->getSessionIdQueryParam($session)
+            );
+        }
+
+        return $proceed($session);
+    }
+}

app/code/Magento/PageBuilder/etc/di.xml

@@ -140,4 +140,15 @@
             </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>
 </config>