MC-31573: PayflowPro Checkout Broken with SameSite Cookie Changes from Chrome 80

Author: serhii-balko

app/code/Magento/Paypal/Controller/Adminhtml/Transparent/Redirect.php

@@ -5,9 +5,67 @@
  */
 namespace Magento\Paypal\Controller\Adminhtml\Transparent;
 
+use Magento\Backend\App\AbstractAction;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\View\Result\LayoutFactory;
+use Magento\Payment\Model\Method\Logger;
+use Magento\Paypal\Model\Payflow\Transparent;
+
 /**
  * Class for redirecting the Paypal response result to Magento controller.
  */
-class Redirect extends \Magento\Paypal\Controller\Transparent\Redirect
+class Redirect extends AbstractAction
 {
+    /**
+     * @var LayoutFactory
+     */
+    private $resultLayoutFactory;
+
+    /**
+     * @var Transparent
+     */
+    private $transparent;
+
+    /**
+     * @var Logger
+     */
+    private $logger;
+
+    /**
+     * @param Context $context
+     * @param LayoutFactory $resultLayoutFactory
+     * @param Transparent $transparent
+     * @param Logger $logger
+     */
+    public function __construct(
+        Context $context,
+        LayoutFactory $resultLayoutFactory,
+        Transparent $transparent,
+        Logger $logger
+    )
+    {
+        parent::__construct($context);
+        $this->transparent = $transparent;
+        $this->logger = $logger;
+        $this->resultLayoutFactory = $resultLayoutFactory;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute()
+    {
+        $gatewayResponse = (array)$this->getRequest()->getPostValue();
+        $this->logger->debug(
+            ['PayPal PayflowPro redirect:' => $gatewayResponse],
+            $this->transparent->getDebugReplacePrivateDataKeys(),
+            $this->transparent->getDebugFlag()
+        );
+
+        $resultLayout = $this->resultLayoutFactory->create();
+        $resultLayout->addDefaultHandle();
+        $resultLayout->getLayout()->getUpdate()->load(['transparent_payment_redirect']);
+
+        return $resultLayout;
+    }
 }

app/code/Magento/Paypal/Controller/Transparent/Redirect.php

@@ -5,8 +5,9 @@
  */
 namespace Magento\Paypal\Controller\Transparent;
 
+use Magento\Framework\App\Action\Action;
+use Magento\Framework\App\Action\Context;
 use Magento\Framework\App\Action\HttpPostActionInterface;
-use Magento\Framework\App\ActionInterface;
 use Magento\Framework\App\CsrfAwareActionInterface;
 use Magento\Framework\App\Request\InvalidRequestException;
 use Magento\Framework\App\RequestInterface;
@@ -19,13 +20,8 @@
 /**
  * Class for redirecting the Paypal response result to Magento controller.
  */
-class Redirect implements ActionInterface, CsrfAwareActionInterface, HttpPostActionInterface
+class Redirect extends Action implements CsrfAwareActionInterface, HttpPostActionInterface
 {
-    /**
-     * @var RequestInterface
-     */
-    private $request;
-
     /**
      * @var LayoutFactory
      */
@@ -42,27 +38,26 @@ class Redirect implements ActionInterface, CsrfAwareActionInterface, HttpPostAct
     private $logger;
 
     /**
-     * Constructor
-     *
-     * @param RequestInterface $request
+     * @param Context $context
      * @param LayoutFactory $resultLayoutFactory
      * @param Transparent $transparent
      * @param Logger $logger
      */
     public function __construct(
-        RequestInterface $request,
+        Context $context,
         LayoutFactory $resultLayoutFactory,
         Transparent $transparent,
         Logger $logger
     ) {
-        $this->request = $request;
         $this->resultLayoutFactory = $resultLayoutFactory;
         $this->transparent = $transparent;
         $this->logger = $logger;
+
+        parent::__construct($context);
     }
 
     /**
-     * @inheritDoc
+     * @inheritdoc
      */
     public function createCsrfValidationException(
         RequestInterface $request
@@ -71,7 +66,7 @@ public function createCsrfValidationException(
     }
 
     /**
-     * @inheritDoc
+     * @inheritdoc
      */
     public function validateForCsrf(RequestInterface $request): ?bool
     {
@@ -86,7 +81,7 @@ public function validateForCsrf(RequestInterface $request): ?bool
      */
     public function execute()
     {
-        $gatewayResponse = (array)$this->request->getPostValue();
+        $gatewayResponse = (array)$this->getRequest()->getPostValue();
         $this->logger->debug(
             ['PayPal PayflowPro redirect:' => $gatewayResponse],
             $this->transparent->getDebugReplacePrivateDataKeys(),