PISHPS-329 UrlParsingService - matching trackign code from tracking url

.github/workflows/ci_pipe.yml

@@ -340,7 +340,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - shopware: '6.6.4.1'
+          - shopware: '6.6.4.0'
             php: '8.2'
           - shopware: '6.5.8.8'
             php: '8.2'

.github/workflows/nightly_pipe.yml

@@ -334,7 +334,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - shopware: '6.6.4.1'
+          - shopware: '6.6.4.0'
             php: '8.2'
           - shopware: '6.5.8.8'
             php: '8.2'

.github/workflows/pr_pipe.yml

@@ -333,7 +333,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - shopware: '6.6.4.1'
+          - shopware: '6.6.4.0'
             php: '8.2'
           - shopware: '6.5.8.8'
             php: '8.2'

makefile

@@ -151,6 +151,12 @@ ifneq (,$(findstring v12,$(NODE_VERSION)))
 endif
 	cd .. && rm -rf ./.build/MolliePayments* && mkdir -p ./.build
 	# -------------------------------------------------------------------------------------------------
+	@echo "UPDATE SHOPWARE DEPENDENCIES"
+	php switch-composer.php dev
+	composer update shopware/core
+	composer update shopware/storefront
+	composer update shopware/administration
+	# -------------------------------------------------------------------------------------------------
 	@echo "INSTALL DEV DEPENDENCIES AND BUILD"
 	make clean -B
 	make dev -B
@@ -168,7 +174,7 @@ endif
 	php switch-composer.php prod
 	# -------------------------------------------------------------------------------------------------
 	@echo "CREATE ZIP FILE"
-	cd .. && zip -qq -r -0 ./.build/MolliePayments.zip MolliePayments/* -x '*/vendor/*' '*.editorconfig' '*.git*' '*.reports*' '*/.idea*' '*/tests*' '*/node_modules*' '*/makefile' '*.DS_Store' '*/.shopware-extension.yml' '*/switch-composer.php' '*/phpunit.xml' '*/.phpunuhi.xml' '*/.infection.json' '*/phpunit.autoload.php' '*/.phpstan*' '*/.php_cs.php' '*/phpinsights.php'
+	cd .. && zip -qq -r -0 ./.build/MolliePayments.zip MolliePayments/* -x '*.editorconfig' '*.git*' '*.reports*' '*/.idea*' '*/tests*' '*/node_modules*' '*/makefile' '*.DS_Store' '*/.shopware-extension.yml' '*/switch-composer.php' '*/phpunit.xml' '*/.phpunuhi.xml' '*/.infection.json' '*/phpunit.autoload.php' '*/.phpstan*' '*/.php_cs.php' '*/phpinsights.php'
 	# -------------------------------------------------------------------------------------------------
 	@echo "RESET COMPOSER.JSON"
 	php switch-composer.php dev

polyfill/Shopware/Core/Checkout/Payment/PaymentException.php

@@ -1,13 +1,13 @@
 <?php declare(strict_types=1);
 
 namespace Shopware\Core\Checkout\Payment;
-use Shopware\Core\Checkout\Payment\Exception\AsyncPaymentFinalizeException;
-use Shopware\Core\Checkout\Payment\Exception\CustomerCanceledAsyncPaymentException;
 
-if (class_exists(PaymentException::class) && !class_exists(AsyncPaymentFinalizeException::class) && !class_exists(CustomerCanceledAsyncPaymentException::class)) {
+if (class_exists(PaymentException::class)) {
     return;
 }
 
+use Shopware\Core\Checkout\Payment\Exception\AsyncPaymentFinalizeException;
+use Shopware\Core\Checkout\Payment\Exception\CustomerCanceledAsyncPaymentException;
 
 class PaymentException extends \Exception
 {

src/Components/ApplePayDirect/ApplePayDirect.php

@@ -2,11 +2,7 @@
 
 namespace Kiener\MolliePayments\Components\ApplePayDirect;
 
-use Kiener\MolliePayments\Components\ApplePayDirect\Exceptions\ApplePayDirectDomainAllowListCanNotBeEmptyException;
-use Kiener\MolliePayments\Components\ApplePayDirect\Exceptions\ApplePayDirectDomainNotInAllowListException;
-use Kiener\MolliePayments\Components\ApplePayDirect\Gateways\ApplePayDirectDomainAllowListGateway;
 use Kiener\MolliePayments\Components\ApplePayDirect\Models\ApplePayCart;
-use Kiener\MolliePayments\Components\ApplePayDirect\Services\ApplePayDirectDomainSanitizer;
 use Kiener\MolliePayments\Components\ApplePayDirect\Services\ApplePayDomainVerificationService;
 use Kiener\MolliePayments\Components\ApplePayDirect\Services\ApplePayFormatter;
 use Kiener\MolliePayments\Components\ApplePayDirect\Services\ApplePayShippingBuilder;
@@ -109,16 +105,6 @@ class ApplePayDirect
      */
     private $repoOrderAdresses;
 
-    /**
-     * @var ApplePayDirectDomainAllowListGateway
-     */
-    private $applePayDirectDomainAllowListGateway;
-
-    /**
-     * @var ApplePayDirectDomainSanitizer
-     */
-    private $domainSanitizer;
-
 
     /**
      * @param ApplePayDomainVerificationService $domainFileDownloader
@@ -135,10 +121,8 @@ class ApplePayDirect
      * @param ShopService $shopService
      * @param OrderService $orderService
      * @param OrderAddressRepositoryInterface $repoOrderAdresses
-     * @param ApplePayDirectDomainAllowListGateway $domainAllowListGateway
-     * @param ApplePayDirectDomainSanitizer $domainSanitizer
      */
-    public function __construct(ApplePayDomainVerificationService $domainFileDownloader, ApplePayPayment $paymentHandler, MolliePaymentDoPay $molliePayments, CartServiceInterface $cartService, ApplePayFormatter $formatter, ApplePayShippingBuilder $shippingBuilder, SettingsService $pluginSettings, CustomerService $customerService, PaymentMethodRepository $repoPaymentMethods, CartBackupService $cartBackupService, MollieApiFactory $mollieApiFactory, ShopService $shopService, OrderService $orderService, OrderAddressRepositoryInterface $repoOrderAdresses, ApplePayDirectDomainAllowListGateway $domainAllowListGateway, ApplePayDirectDomainSanitizer $domainSanitizer)
+    public function __construct(ApplePayDomainVerificationService $domainFileDownloader, ApplePayPayment $paymentHandler, MolliePaymentDoPay $molliePayments, CartServiceInterface $cartService, ApplePayFormatter $formatter, ApplePayShippingBuilder $shippingBuilder, SettingsService $pluginSettings, CustomerService $customerService, PaymentMethodRepository $repoPaymentMethods, CartBackupService $cartBackupService, MollieApiFactory $mollieApiFactory, ShopService $shopService, OrderService $orderService, OrderAddressRepositoryInterface $repoOrderAdresses)
     {
         $this->domainFileDownloader = $domainFileDownloader;
         $this->paymentHandler = $paymentHandler;
@@ -154,8 +138,6 @@ public function __construct(ApplePayDomainVerificationService $domainFileDownloa
         $this->shopService = $shopService;
         $this->orderService = $orderService;
         $this->repoOrderAdresses = $repoOrderAdresses;
-        $this->applePayDirectDomainAllowListGateway = $domainAllowListGateway;
-        $this->domainSanitizer = $domainSanitizer;
     }
 
 
@@ -279,16 +261,18 @@ public function setShippingMethod(string $shippingMethodID, SalesChannelContext
 
     /**
      * @param string $validationURL
-     * @param string $domain
      * @param SalesChannelContext $context
      * @throws ApiException
-     * @throws ApplePayDirectDomainAllowListCanNotBeEmptyException
-     * @throws ApplePayDirectDomainNotInAllowListException
      * @return string
      */
-    public function createPaymentSession(string $validationURL, string $domain, SalesChannelContext $context): string
+    public function createPaymentSession(string $validationURL, SalesChannelContext $context): string
     {
-        $domain = $this->getValidDomain($domain, $context);
+        # make sure to get rid of any http prefixes or
+        # also any sub shop slugs like /de or anything else
+        # that would NOT work with Mollie and Apple Pay!
+        $domainExtractor = new DomainExtractor();
+        $domain = $domainExtractor->getCleanDomain($this->shopService->getShopUrl(true));
+
         # we always have to use the LIVE api key for
         # our first domain validation for Apple Pay!
         # the rest will be done with our test API key (if test mode active), or also Live API key (no test mode)
@@ -523,39 +507,4 @@ private function buildApplePayCart(Cart $cart): ApplePayCart
 
         return $appleCart;
     }
-
-    /**
-     * This method will return a valid domain if not provided by the user it will use the shop domain
-     *
-     * @param SalesChannelContext $context
-     * @param string $domain
-     * @throws ApplePayDirectDomainAllowListCanNotBeEmptyException
-     * @throws ApplePayDirectDomainNotInAllowListException
-     * @return string
-     */
-    private function getValidDomain(string $domain, SalesChannelContext $context): string
-    {
-        #   if we have no domain, then we need to use the shop domain
-        if (empty($domain)) {
-            # make sure to get rid of any http prefixes or
-            # also any sub shop slugs like /de or anything else
-            # that would NOT work with Mollie and Apple Pay!
-            $domainExtractor = new DomainExtractor();
-            return $domainExtractor->getCleanDomain($this->shopService->getShopUrl(true));
-        }
-
-        $allowList = $this->applePayDirectDomainAllowListGateway->getAllowList($context);
-
-        if ($allowList->isEmpty()) {
-            throw new ApplePayDirectDomainAllowListCanNotBeEmptyException();
-        }
-
-        $sanitizedDomain = $this->domainSanitizer->sanitizeDomain($domain);
-
-        if ($allowList->contains($sanitizedDomain) === false) {
-            throw new ApplePayDirectDomainNotInAllowListException($sanitizedDomain);
-        }
-
-        return $sanitizedDomain;
-    }
 }