[PW-3006] 3DS redirect to wrong storefront (#821)

* Fix redirect url with the correct store

* redirect shopper after 3ds to current store
Co-authored-by: Attila Kiss <42297201+cyattilakiss@users.noreply.github.com>

Helper/Requests.php

@@ -35,27 +35,35 @@ use Magento\Quote\Api\Data\PaymentInterface;
 class Requests extends AbstractHelper
 {
     /**
-     * @var \Adyen\Payment\Helper\Data
+     * @var Data
      */
     private $adyenHelper;
+
     /**
      * @var \Adyen\Payment\Helper\Config
      */
     private $adyenConfig;
 
+    /**
+     * @var \Magento\Framework\UrlInterface
+     */
+    private $urlBuilder;
+
     /**
      * Requests constructor.
      *
      * @param Data $adyenHelper
-     * @param Config $adyenConfig ;
+     * @param Config $adyenConfig
+     * @param \Magento\Framework\UrlInterface $urlBuilder
      */
-
     public function __construct(
         \Adyen\Payment\Helper\Data $adyenHelper,
-        \Adyen\Payment\Helper\Config $adyenConfig
+        \Adyen\Payment\Helper\Config $adyenConfig,
+        \Magento\Framework\UrlInterface $urlBuilder
     ) {
         $this->adyenHelper = $adyenHelper;
         $this->adyenConfig = $adyenConfig;
+        $this->urlBuilder = $urlBuilder;
     }
 
     /**
@@ -357,8 +365,7 @@ class Requests extends AbstractHelper
     {
         $request['redirectFromIssuerMethod'] = 'GET';
         $request['redirectToIssuerMethod'] = 'POST';
-        $request['returnUrl'] = $this->adyenHelper->getOrigin($storeId) . '/adyen/process/redirect';
-
+        $request['returnUrl'] = $this->urlBuilder->getUrl('adyen/process/redirect');
         return $request;
     }