Merge pull request #44 from shopware/next-37028/iaf-filter-gateway

NEXT-37028 - IAP filter gateway
shopware · Dec 17, 2024 · 45f54f8 · 45f54f8
2 parents 25ac90b + 6071078
commit 45f54f8
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
         "php": ">=8.1",
         "symfony/psr-http-message-bridge": "2.* || ^7.0",
         "symfony/routing": "^6.4 || ^7.0",
-        "shopware/app-php-sdk": ">=3.1.4",
+        "shopware/app-php-sdk": ">=4.0.1",
         "symfony/http-client": "^6.4 || ^7.0",
         "nyholm/psr7": "^1.8"
     },

diff --git a/src/ArgumentValueResolver/ContextArgumentResolver.php b/src/ArgumentValueResolver/ContextArgumentResolver.php
@@ -8,6 +8,7 @@
 use Shopware\App\SDK\Context\ActionButton\ActionButtonAction;
 use Shopware\App\SDK\Context\ContextResolver;
 use Shopware\App\SDK\Context\Gateway\Checkout\CheckoutGatewayAction;
+use Shopware\App\SDK\Context\Gateway\InAppFeatures\FilterAction;
 use Shopware\App\SDK\Context\Module\ModuleAction;
 use Shopware\App\SDK\Context\Payment\PaymentCaptureAction;
 use Shopware\App\SDK\Context\Payment\PaymentFinalizeAction;
@@ -41,6 +42,7 @@ final class ContextArgumentResolver implements ValueResolverInterface
         RefundAction::class => true,
         StorefrontAction::class => true,
         CheckoutGatewayAction::class => true,
+        FilterAction::class => true,
     ];
 
     private const SIGNING_REQUIRED_TYPES = [
@@ -68,6 +70,7 @@ public function supports(Request $request, ArgumentMetadata $argument): bool
 
     /**
      * @return iterable<object>
+     * @throws \JsonException|\RuntimeException
      */
     public function resolve(Request $request, ArgumentMetadata $argument): iterable
     {
@@ -118,6 +121,7 @@ public function resolve(Request $request, ArgumentMetadata $argument): iterable
             RefundAction::class => yield $this->contextResolver->assemblePaymentRefund($psrRequest, $shop),
             StorefrontAction::class => yield $this->contextResolver->assembleStorefrontRequest($psrRequest, $shop),
             CheckoutGatewayAction::class => yield $this->contextResolver->assembleCheckoutGatewayRequest($psrRequest, $shop),
+            FilterAction::class => yield $this->contextResolver->assembleInAppPurchasesFilterRequest($psrRequest, $shop),
             default => throw new \RuntimeException(sprintf('Unsupported type %s', $type)),
         };
     }

diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
@@ -29,7 +29,25 @@
 
         <service id="Shopware\App\SDK\Authentication\RequestVerifier"/>
         <service id="Shopware\App\SDK\Authentication\ResponseSigner"/>
-        <service id="Shopware\App\SDK\Context\ContextResolver"/>
+
+        <service id="Symfony\Component\Cache\Psr16Cache">
+            <argument type="service" id="cache.app"/>
+        </service>
+
+        <service id="Shopware\App\SDK\Context\InAppPurchase\SBPStoreKeyFetcher">
+            <argument type="service" id="Psr\Http\Client\ClientInterface"/>
+            <argument type="service" id="Symfony\Component\Cache\Psr16Cache"/>
+            <argument type="service" id="Psr\Log\LoggerInterface"/>
+        </service>
+
+        <service id="Shopware\App\SDK\Context\InAppPurchase\InAppPurchaseProvider">
+            <argument type="service" id="Shopware\App\SDK\Context\InAppPurchase\SBPStoreKeyFetcher"/>
+            <argument type="service" id="Psr\Log\LoggerInterface"/>
+        </service>
+
+        <service id="Shopware\App\SDK\Context\ContextResolver">
+            <argument type="service" id="Shopware\App\SDK\Context\InAppPurchase\InAppPurchaseProvider"/>
+        </service>
 
         <service id="Shopware\App\SDK\Shop\ShopResolver">
             <argument type="service" id="Shopware\App\SDK\Shop\ShopRepositoryInterface"/>

diff --git a/tests/ArgumentValueResolver/ContextArgumentResolverTest.php b/tests/ArgumentValueResolver/ContextArgumentResolverTest.php
@@ -13,6 +13,7 @@
 use Shopware\App\SDK\Context\ActionButton\ActionButtonAction;
 use Shopware\App\SDK\Context\ContextResolver;
 use Shopware\App\SDK\Context\Gateway\Checkout\CheckoutGatewayAction;
+use Shopware\App\SDK\Context\Gateway\InAppFeatures\FilterAction;
 use Shopware\App\SDK\Context\Module\ModuleAction;
 use Shopware\App\SDK\Context\Payment\PaymentCaptureAction;
 use Shopware\App\SDK\Context\Payment\PaymentFinalizeAction;
@@ -238,6 +239,7 @@ public static function provideActions(): \Generator
         yield [RefundAction::class];
         yield [StorefrontAction::class];
         yield [CheckoutGatewayAction::class];
+        yield [FilterAction::class];
     }
 
     #[DataProvider('provideActions')]