PAYOSWXP-150: apple pay: add proxy controller for apple-pay routes

src/Components/ApplePay/Controller/CheckoutController.php

@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PayonePayment\Components\ApplePay\Controller;
+
+use PayonePayment\Components\ApplePay\StoreApi\Route\AbstractApplePayRoute;
+use Shopware\Core\System\SalesChannel\SalesChannelContext;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Attribute\Route;
+
+#[Route(
+    path: '/payone/apple-pay/',
+    options: ['seo' => false],
+    defaults: [
+        'XmlHttpRequest' => true,
+        '_routeScope' => ['storefront'],
+        '_loginRequired' => true,
+        '_loginRequiredAllowGuest' => true,
+    ],
+)]
+class CheckoutController
+{
+    public function __construct(
+        private readonly AbstractApplePayRoute $route
+    ) {
+    }
+
+    #[Route(path: 'validate-merchant', name: 'frontend.payone.apple-pay.validate-merchant', methods: ['POST'])]
+    public function validateMerchant(Request $request, SalesChannelContext $salesChannelContext): Response
+    {
+        return $this->route->validateMerchant($request, $salesChannelContext);
+    }
+
+    #[Route(path: 'process-payment', name: 'frontend.payone.apple-pay.process-payment', methods: ['POST'])]
+    public function processPayment(Request $request, SalesChannelContext $salesChannelContext): Response
+    {
+        return $this->route->process($request, $salesChannelContext);
+    }
+}

src/StoreApi/Route/AbstractApplePayRoute.php → src/Components/ApplePay/StoreApi/Route/AbstractApplePayRoute.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PayonePayment\StoreApi\Route;
+namespace PayonePayment\Components\ApplePay\StoreApi\Route;
 
 use Shopware\Core\System\SalesChannel\SalesChannelContext;
 use Symfony\Component\HttpFoundation\Request;

src/StoreApi/Route/ApplePayRoute.php → src/Components/ApplePay/StoreApi/Route/ApplePayRoute.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PayonePayment\StoreApi\Route;
+namespace PayonePayment\Components\ApplePay\StoreApi\Route;
 
 use GuzzleHttp\Client;
 use PayonePayment\Components\ConfigReader\ConfigReaderInterface;

src/Controller/SettingsController.php

@@ -4,6 +4,7 @@
 
 namespace PayonePayment\Controller;
 
+use PayonePayment\Components\ApplePay\StoreApi\Route\ApplePayRoute;
 use PayonePayment\Configuration\ConfigurationPrefixes;
 use PayonePayment\PaymentHandler as Handler;
 use PayonePayment\Payone\Client\Exception\PayoneRequestException;
@@ -12,7 +13,6 @@
 use PayonePayment\Payone\RequestParameter\Builder\Amazon\AbstractAmazonRequestParameterBuilder;
 use PayonePayment\Payone\RequestParameter\RequestParameterFactory;
 use PayonePayment\Payone\RequestParameter\Struct\TestCredentialsStruct;
-use PayonePayment\StoreApi\Route\ApplePayRoute;
 use Psr\Log\LoggerInterface;
 use Shopware\Core\Checkout\Payment\PaymentMethodEntity;
 use Shopware\Core\Framework\Context;

src/DependencyInjection/controllers.xml

@@ -161,5 +161,9 @@
             <tag name="controller.service_arguments" />
         </service>
 
+        <service id="PayonePayment\Components\ApplePay\Controller\CheckoutController" autowire="true">
+            <tag name="controller.service_arguments" />
+        </service>
+
     </services>
 </container>

src/DependencyInjection/store_api.xml

@@ -14,7 +14,10 @@
             <argument type="service" id="PayonePayment\Components\MandateService\MandateService" />
         </service>
 
-        <service id="PayonePayment\StoreApi\Route\ApplePayRoute">
+        <service id="PayonePayment\Components\ApplePay\StoreApi\Route\AbstractApplePayRoute"
+                 alias="PayonePayment\Components\ApplePay\StoreApi\Route\ApplePayRoute"/>
+
+        <service id="PayonePayment\Components\ApplePay\StoreApi\Route\ApplePayRoute">
             <argument type="service" id="payone.app_system.guzzle" />
             <argument type="service" id="monolog.logger.payone" />
             <argument type="service" id="PayonePayment\Payone\RequestParameter\RequestParameterFactory"/>

src/EventListener/CheckoutConfirmApplePayEventListener.php

@@ -4,9 +4,9 @@
 
 namespace PayonePayment\EventListener;
 
+use PayonePayment\Components\ApplePay\StoreApi\Route\ApplePayRoute;
 use PayonePayment\Core\Utils\PayoneClassLoader;
 use PayonePayment\PaymentMethod\PayoneApplePay;
-use PayonePayment\StoreApi\Route\ApplePayRoute;
 use Shopware\Storefront\Page\Account\Order\AccountEditOrderPageLoadedEvent;
 use Shopware\Storefront\Page\Account\PaymentMethod\AccountPaymentMethodPageLoadedEvent;
 use Shopware\Storefront\Page\Checkout\Confirm\CheckoutConfirmPageLoadedEvent;

src/Resources/config/routes.xml

@@ -3,5 +3,6 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
     <import resource="../../**/Controller/**/*" type="attribute" />
+    <import resource="../../**/StoreApi/Route/**/*" type="attribute" />
     <import resource="../../StoreApi/Route/*" type="attribute" />
 </routes>

src/Resources/views/storefront/component/checkout/apple-pay-button.html.twig

@@ -9,8 +9,8 @@
         <input type="hidden" name="orderId" value="{{ page.order.id }}"/>
 
         <apple-pay-button
-            data-validate-merchant-url="{{ path('store-api.payone.apple-pay.validate-merchant') }}"
-            data-process-payment-url="{{ path('store-api.payone.apple-pay.process') }}"
+            data-validate-merchant-url="{{ path('frontend.payone.apple-pay.validate-merchant') }}"
+            data-process-payment-url="{{ path('frontend.payone.apple-pay.process-payment') }}"
             data-payone-payment-apple-pay-options='{
                 "countryCode": "{{ context.customer.defaultBillingAddress.country.iso }}",
                 "currencyCode": "{{ context.currency.isoCode }}",

tests/TestBootstrap.php

@@ -33,7 +33,7 @@
 $classLoser = (new TestBootstrapper())
     ->setProjectDir($projectRoot)
     ->setLoadEnvFile(true)
-    ->setForceInstallPlugins(true)
+    //->setForceInstallPlugins(true)
     ->addCallingPlugin()
     ->setDatabaseUrl($_SERVER['TEST_DATABASE_URL'] ?? null)
     ->bootstrap();