Merge remote-tracking branch 'local/MC-39861' into PRodubovyk20201222

Author: Oleksandr Dubovyk

app/code/Magento/Paypal/Controller/Hostedpro/ReturnAction.php

@@ -26,11 +26,7 @@ class ReturnAction extends Action implements CsrfAwareActionInterface, HttpPostA
      */
     public function execute()
     {
-        $session = $this->_objectManager->get(\Magento\Checkout\Model\Session::class);
-        //TODO: some actions with order
-        if ($session->getLastRealOrderId()) {
-            $this->_redirect('checkout/onepage/success');
-        }
+        $this->_redirect('checkout/onepage/success');
     }
 
     /**

app/code/Magento/Paypal/Plugin/TransparentSessionChecker.php

@@ -15,7 +15,13 @@
  */
 class TransparentSessionChecker
 {
-    private const TRANSPARENT_REDIRECT_PATH = 'paypal/transparent/redirect';
+    /**
+     * @var string[]
+     */
+    private $disableSessionUrls = [
+        'paypal/transparent/redirect',
+        'paypal/hostedpro/return',
+    ];
 
     /**
      * @var Http
@@ -45,6 +51,12 @@ public function afterCheck(SessionStartChecker $subject, bool $result): bool
             return false;
         }
 
-        return strpos((string)$this->request->getPathInfo(), self::TRANSPARENT_REDIRECT_PATH) === false;
+        foreach ($this->disableSessionUrls as $url) {
+            if (strpos((string)$this->request->getPathInfo(), $url) !== false) {
+                return false;
+            }
+        }
+
+        return true;
     }
 }

dev/tests/integration/testsuite/Magento/Paypal/Controller/Hostedpro/ReturnActionTest.php

@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Paypal\Controller\Hostedpro;
+
+use Magento\TestFramework\TestCase\AbstractController;
+use Laminas\Stdlib\Parameters;
+
+/**
+ * Tests PayPal HostedPro return controller.
+ */
+class ReturnActionTest extends AbstractController
+{
+    /**
+     * Tests customer redirect on success page after return from PayPal HostedPro payment.
+     *
+     * @SuppressWarnings(PHPMD.Superglobals)
+     */
+    public function testReturnRedirect()
+    {
+        $redirectUri = 'paypal/hostedpro/return';
+        $this->setRequestUri($redirectUri);
+        $this->getRequest()->setMethod('POST');
+
+        $this->dispatch($redirectUri);
+        $this->assertRedirect($this->stringContains('checkout/onepage/success'));
+
+        $this->assertEmpty(
+            $_SESSION,
+            'Session start has to be skipped for current controller'
+        );
+    }
+
+    /**
+     * Sets REQUEST_URI into request object.
+     *
+     * @param string $requestUri
+     * @return void
+     */
+    private function setRequestUri(string $requestUri)
+    {
+        $request = $this->getRequest();
+        $reflection = new \ReflectionClass($request);
+        $property = $reflection->getProperty('requestUri');
+        $property->setAccessible(true);
+        $property->setValue($request, null);
+
+        $request->setServer(new Parameters(['REQUEST_URI' => $requestUri]));
+    }
+}