Skip to content

Instantly share code, notes, and snippets.

@sjb9774

sjb9774/MDVA-25602_EE_2.3.4_v1.composer.patch

Created March 2, 2020 19:48
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save sjb9774/971a28d309dee2f24b853c84e0295693 to your computer and use it in GitHub Desktop.
Save sjb9774/971a28d309dee2f24b853c84e0295693 to your computer and use it in GitHub Desktop.
Download ZIP
Patch for PayflowPro Checkout Issue https://github.com/magento/magento2/issues/26840
Raw
MDVA-25602_EE_2.3.4_v1.composer.patch
diff --git a/vendor/magento/module-payment/Block/Transparent/Redirect.php b/vendor/magento/module-payment/Block/Transparent/Redirect.php
new file mode 100644
index 00000000000..aeaeee7e4d2
--- /dev/null
+++ b/vendor/magento/module-payment/Block/Transparent/Redirect.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Payment\Block\Transparent;
+
+use Magento\Framework\UrlInterface;
+use Magento\Framework\View\Element\Template;
+use Magento\Framework\View\Element\Template\Context;
+
+/**
+ * Redirect block for register specific params in layout
+ */
+class Redirect extends Template
+{
+ /**
+ * Route path key to make redirect url.
+ */
+ private const ROUTE_PATH = 'route_path';
+
+ /**
+ * @var UrlInterface
+ */
+ private $url;
+
+ /**
+ * @param Context $context
+ * @param UrlInterface $url
+ * @param array $data
+ */
+ public function __construct(
+ Context $context,
+ UrlInterface $url,
+ array $data = []
+ ) {
+ $this->url = $url;
+ parent::__construct($context, $data);
+ }
+
+ /**
+ * Returns url for redirect.
+ *
+ * @return string
+ */
+ public function getRedirectUrl(): string
+ {
+ return $this->url->getUrl($this->getData(self::ROUTE_PATH));
+ }
+
+ /**
+ * Returns params to be redirected.
+ *
+ * @return array
+ */
+ public function getPostParams(): array
+ {
+ return (array)$this->_request->getPostValue();
+ }
+}
diff --git a/vendor/magento/module-payment/view/adminhtml/templates/transparent/redirect.phtml b/vendor/magento/module-payment/view/adminhtml/templates/transparent/redirect.phtml
new file mode 100644
index 00000000000..17fbdf780a4
--- /dev/null
+++ b/vendor/magento/module-payment/view/adminhtml/templates/transparent/redirect.phtml
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var \Magento\Payment\Block\Transparent\Redirect $block */
+$params = $block->getPostParams();
+$redirectUrl = $block->getRedirectUrl();
+?>
+<html>
+<head></head>
+<body onload="document.forms['proxy_form'].submit()">
+<form id="proxy_form" action="<?= $block->escapeUrl($redirectUrl) ?>"
+ method="POST" hidden enctype="application/x-www-form-urlencoded" class="no-display">
+ <?php foreach ($params as $name => $value):?>
+ <input value="<?= $block->escapeHtmlAttr($value) ?>" name="<?= $block->escapeHtmlAttr($name) ?>" type="hidden"/>
+ <?php endforeach?>
+</form>
+</body>
+</html>
diff --git a/vendor/magento/module-payment/view/frontend/templates/transparent/redirect.phtml b/vendor/magento/module-payment/view/frontend/templates/transparent/redirect.phtml
new file mode 100644
index 00000000000..17fbdf780a4
--- /dev/null
+++ b/vendor/magento/module-payment/view/frontend/templates/transparent/redirect.phtml
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var \Magento\Payment\Block\Transparent\Redirect $block */
+$params = $block->getPostParams();
+$redirectUrl = $block->getRedirectUrl();
+?>
+<html>
+<head></head>
+<body onload="document.forms['proxy_form'].submit()">
+<form id="proxy_form" action="<?= $block->escapeUrl($redirectUrl) ?>"
+ method="POST" hidden enctype="application/x-www-form-urlencoded" class="no-display">
+ <?php foreach ($params as $name => $value):?>
+ <input value="<?= $block->escapeHtmlAttr($value) ?>" name="<?= $block->escapeHtmlAttr($name) ?>" type="hidden"/>
+ <?php endforeach?>
+</form>
+</body>
+</html>
diff --git a/vendor/magento/module-paypal/Controller/Adminhtml/Transparent/Redirect.php b/vendor/magento/module-paypal/Controller/Adminhtml/Transparent/Redirect.php
new file mode 100644
index 00000000000..8201761cc3a
--- /dev/null
+++ b/vendor/magento/module-paypal/Controller/Adminhtml/Transparent/Redirect.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Paypal\Controller\Adminhtml\Transparent;
+
+/**
+ * Class for redirecting the Paypal response result to Magento controller.
+ */
+class Redirect extends \Magento\Paypal\Controller\Transparent\Redirect
+{
+}
diff --git a/vendor/magento/module-paypal/Controller/Transparent/Redirect.php b/vendor/magento/module-paypal/Controller/Transparent/Redirect.php
new file mode 100644
index 00000000000..c6cee15d23c
--- /dev/null
+++ b/vendor/magento/module-paypal/Controller/Transparent/Redirect.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Paypal\Controller\Transparent;
+
+use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\App\CsrfAwareActionInterface;
+use Magento\Framework\App\Request\InvalidRequestException;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Controller\ResultInterface;
+use Magento\Framework\Exception\LocalizedException;
+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\Framework\App\Action\Action implements CsrfAwareActionInterface, HttpPostActionInterface
+{
+ /**
+ * @var LayoutFactory
+ */
+ private $resultLayoutFactory;
+
+ /**
+ * @var Transparent
+ */
+ private $transparent;
+
+ /**
+ * @var Logger
+ */
+ private $logger;
+
+ /**
+ * Constructor
+ *
+ * @param Context $context
+ * @param LayoutFactory $resultLayoutFactory
+ * @param Transparent $transparent
+ * @param Logger $logger
+ */
+ public function __construct(
+ Context $context,
+ LayoutFactory $resultLayoutFactory,
+ Transparent $transparent,
+ Logger $logger
+ ) {
+ $this->resultLayoutFactory = $resultLayoutFactory;
+ $this->transparent = $transparent;
+ $this->logger = $logger;
+
+ parent::__construct($context);
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function createCsrfValidationException(
+ RequestInterface $request
+ ): ?InvalidRequestException {
+ return null;
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function validateForCsrf(RequestInterface $request): ?bool
+ {
+ return true;
+ }
+
+ /**
+ * Saves the payment in quote
+ *
+ * @return ResultInterface
+ * @throws LocalizedException
+ */
+ 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;
+ }
+}
diff --git a/vendor/magento/module-paypal/Model/Payflow/Service/Request/SecureToken.php b/vendor/magento/module-paypal/Model/Payflow/Service/Request/SecureToken.php
index 2a4ec764c41..6e9990f65c4 100644
--- a/vendor/magento/module-paypal/Model/Payflow/Service/Request/SecureToken.php
+++ b/vendor/magento/module-paypal/Model/Payflow/Service/Request/SecureToken.php
@@ -70,9 +70,9 @@ class SecureToken
$request->setCurrency($quote->getBaseCurrencyCode());
$request->setCreatesecuretoken('Y');
$request->setSecuretokenid($this->mathRandom->getUniqueHash());
- $request->setReturnurl($urls['return_url'] ?? $this->url->getUrl('paypal/transparent/response'));
- $request->setErrorurl($urls['error_url'] ?? $this->url->getUrl('paypal/transparent/response'));
- $request->setCancelurl($urls['cancel_url'] ?? $this->url->getUrl('paypal/transparent/response'));
+ $request->setReturnurl($urls['return_url'] ?? $this->url->getUrl('paypal/transparent/redirect'));
+ $request->setErrorurl($urls['error_url'] ?? $this->url->getUrl('paypal/transparent/redirect'));
+ $request->setCancelurl($urls['cancel_url'] ?? $this->url->getUrl('paypal/transparent/redirect'));
$request->setDisablereceipt('TRUE');
$request->setSilenttran('TRUE');
diff --git a/vendor/magento/module-paypal/Model/Payflow/Service/Response/Transaction.php b/vendor/magento/module-paypal/Model/Payflow/Service/Response/Transaction.php
index 5db78e6fac5..1e97ac8b8c7 100644
--- a/vendor/magento/module-paypal/Model/Payflow/Service/Response/Transaction.php
+++ b/vendor/magento/module-paypal/Model/Payflow/Service/Response/Transaction.php
@@ -19,7 +19,8 @@ use Magento\Quote\Model\Quote\Payment;
use Magento\Sales\Api\Data\OrderPaymentInterface;
/**
- * Class Transaction
+ * Process PayPal transaction response.
+ *
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Transaction
@@ -90,7 +91,7 @@ class Transaction
$response = $this->transparent->mapGatewayResponse((array) $gatewayTransactionResponse, $response);
$this->logger->debug(
- (array) $gatewayTransactionResponse,
+ ['PayPal PayflowPro response:' => (array)$gatewayTransactionResponse],
(array) $this->transparent->getDebugReplacePrivateDataKeys(),
(bool) $this->transparent->getDebugFlag()
);
diff --git a/vendor/magento/module-paypal/Plugin/TransparentSessionChecker.php b/vendor/magento/module-paypal/Plugin/TransparentSessionChecker.php
new file mode 100644
index 00000000000..5157ba3208f
--- /dev/null
+++ b/vendor/magento/module-paypal/Plugin/TransparentSessionChecker.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Paypal\Plugin;
+
+use Magento\Framework\App\Request\Http;
+use Magento\Framework\Session\SessionStartChecker;
+
+/**
+ * Intended to preserve session cookie after submitting POST form from PayPal to Magento controller.
+ */
+class TransparentSessionChecker
+{
+ private const TRANSPARENT_REDIRECT_PATH = 'paypal/transparent/redirect';
+
+ /**
+ * @var Http
+ */
+ private $request;
+
+ /**
+ * @param Http $request
+ */
+ public function __construct(
+ Http $request
+ ) {
+ $this->request = $request;
+ }
+
+ /**
+ * Prevents session starting while instantiating PayPal transparent redirect controller.
+ *
+ * @param SessionStartChecker $subject
+ * @param bool $result
+ * @return bool
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function afterCheck(SessionStartChecker $subject, bool $result): bool
+ {
+ if ($result === false) {
+ return false;
+ }
+
+ return strpos((string)$this->request->getPathInfo(), self::TRANSPARENT_REDIRECT_PATH) === false;
+ }
+}
diff --git a/vendor/magento/module-paypal/etc/di.xml b/vendor/magento/module-paypal/etc/di.xml
index c0141bbb321..973ed0f9192 100644
--- a/vendor/magento/module-paypal/etc/di.xml
+++ b/vendor/magento/module-paypal/etc/di.xml
@@ -252,4 +252,7 @@
</argument>
</arguments>
</type>
+ <type name="Magento\Framework\Session\SessionStartChecker">
+ <plugin name="transparent_session_checker" type="Magento\Paypal\Plugin\TransparentSessionChecker"/>
+ </type>
</config>
diff --git a/vendor/magento/module-paypal/etc/frontend/page_types.xml b/vendor/magento/module-paypal/etc/frontend/page_types.xml
index 133ab1ca761..1da5d54fb38 100644
--- a/vendor/magento/module-paypal/etc/frontend/page_types.xml
+++ b/vendor/magento/module-paypal/etc/frontend/page_types.xml
@@ -14,6 +14,7 @@
<type id="paypal_payflow_form" label="Paypal Payflow Form"/>
<type id="transparent" label="Paypal Payflow TR Form"/>
<type id="transparent_payment_response" label="Paypal Payflow TR Response"/>
+ <type id="transparent_payment_redirect" label="Paypal Payflow TR Redirect"/>
<type id="paypal_payflow_returnurl" label="Paypal Payflow Return URL"/>
<type id="paypal_payflowadvanced_cancelpayment" label="Paypal Payflow Advanced Cancel Payment"/>
<type id="paypal_payflowadvanced_form" label="Paypal Payflow Advanced Form"/>
diff --git a/vendor/magento/module-paypal/view/adminhtml/layout/transparent_payment_redirect.xml b/vendor/magento/module-paypal/view/adminhtml/layout/transparent_payment_redirect.xml
new file mode 100644
index 00000000000..01acf03c0d0
--- /dev/null
+++ b/vendor/magento/module-paypal/view/adminhtml/layout/transparent_payment_redirect.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/layout_generic.xsd">
+ <container name="root" label="Root">
+ <block class="Magento\Payment\Block\Transparent\Redirect" name="transparent_redirect" template="Magento_Payment::transparent/redirect.phtml">
+ <arguments>
+ <argument name="route_path" xsi:type="string">paypal/transparent/response</argument>
+ </arguments>
+ </block>
+ </container>
+</layout>
diff --git a/vendor/magento/module-paypal/view/frontend/layout/transparent_payment_redirect.xml b/vendor/magento/module-paypal/view/frontend/layout/transparent_payment_redirect.xml
new file mode 100644
index 00000000000..01acf03c0d0
--- /dev/null
+++ b/vendor/magento/module-paypal/view/frontend/layout/transparent_payment_redirect.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/layout_generic.xsd">
+ <container name="root" label="Root">
+ <block class="Magento\Payment\Block\Transparent\Redirect" name="transparent_redirect" template="Magento_Payment::transparent/redirect.phtml">
+ <arguments>
+ <argument name="route_path" xsi:type="string">paypal/transparent/response</argument>
+ </arguments>
+ </block>
+ </container>
+</layout>
diff --git a/vendor/magento/module-website-restriction/etc/webrestrictions.xml b/vendor/magento/module-website-restriction/etc/webrestrictions.xml
index 025df9529b1..86389f5e427 100644
--- a/vendor/magento/module-website-restriction/etc/webrestrictions.xml
+++ b/vendor/magento/module-website-restriction/etc/webrestrictions.xml
@@ -25,6 +25,7 @@
<action path="paypal_payflowadvanced_silentPost" type="generic" />
<action path="authorizenet_directpost_payment_response" type="generic" />
<action path="transparent_payment_response" type="generic" />
+ <action path="transparent_payment_redirect" type="generic" />
<action path="customer_account_create" type="register" />
<action path="customer_account_createPost" type="register" />
</config>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment