PAYOSWXP-123

please see related issue for more information
PAYONE-GmbH · Jan 24, 2024 · 8b88958 · 8b88958
1 parent cd18bee
commit 8b88958
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 1 deletion.
diff --git a/src/Payone/RequestParameter/RequestParameterFactory.php b/src/Payone/RequestParameter/RequestParameterFactory.php
@@ -6,6 +6,7 @@
 
 use PayonePayment\Payone\RequestParameter\Builder\AbstractRequestParameterBuilder;
 use PayonePayment\Payone\RequestParameter\Struct\AbstractRequestParameterStruct;
+use PayonePayment\Payone\RequestParameter\Struct\ClientApiRequest;
 use PayonePayment\Payone\RequestParameter\Struct\GetFileStruct;
 
 class RequestParameterFactory
@@ -53,6 +54,12 @@ private function filterParams(AbstractRequestParameterStruct $arguments, array $
             unset($parameters['aid'], $parameters['hash']);
         }
 
+        if ($arguments instanceof ClientApiRequest) {
+            unset($parameters['key']);
+        } else {
+            unset($parameters['hash']);
+        }
+
         return $parameters;
     }
 

diff --git a/src/Payone/RequestParameter/Struct/ClientApiRequest.php b/src/Payone/RequestParameter/Struct/ClientApiRequest.php
@@ -0,0 +1,7 @@
+<?php declare(strict_types=1);
+
+namespace PayonePayment\Payone\RequestParameter\Struct;
+
+interface ClientApiRequest
+{
+}
diff --git a/src/Payone/RequestParameter/Struct/CreditCardCheckStruct.php b/src/Payone/RequestParameter/Struct/CreditCardCheckStruct.php
@@ -7,7 +7,7 @@
 use PayonePayment\Payone\RequestParameter\Struct\Traits\SalesChannelContextTrait;
 use Shopware\Core\System\SalesChannel\SalesChannelContext;
 
-class CreditCardCheckStruct extends AbstractRequestParameterStruct
+class CreditCardCheckStruct extends AbstractRequestParameterStruct implements ClientApiRequest
 {
     use SalesChannelContextTrait;
 

diff --git a/tests/Payone/RequestParameter/RequestParameterFactoryTest.php b/tests/Payone/RequestParameter/RequestParameterFactoryTest.php
@@ -8,6 +8,7 @@
 use PayonePayment\PaymentHandler\PayoneDebitPaymentHandler;
 use PayonePayment\Payone\RequestParameter\Builder\AbstractRequestParameterBuilder;
 use PayonePayment\Payone\RequestParameter\Struct\AbstractRequestParameterStruct;
+use PayonePayment\Payone\RequestParameter\Struct\ClientApiRequest;
 use PayonePayment\Payone\RequestParameter\Struct\GetFileStruct;
 use PayonePayment\TestCaseBase\PayoneTestBehavior;
 use PHPUnit\Framework\TestCase;
@@ -45,6 +46,29 @@ public function testItReturnsCorrectRequestParametersWithKey(): void
             ],
             $parameters
         );
+        static::assertArrayHasKey('key', $parameters);
+        static::assertArrayNotHasKey('hash', $parameters);
+    }
+
+    public function testItReturnsCorrectRequestParametersWithHash(): void
+    {
+        $factory = new RequestParameterFactory([
+            $this->getSupportedParameterBuilder([
+                'key' => 'value',
+                'key-1' => 'value-1',
+                'key-2' => 'value-2',
+            ]),
+            $this->getSupportedParameterBuilder([
+                'key-2' => 'other-value',
+                'key-3' => 'value-3',
+            ]),
+            $this->getNotSupportedParameterBuilder(),
+        ]);
+
+        $parameters = $factory->getRequestParameter(new class() extends AbstractRequestParameterStruct implements ClientApiRequest {
+        });
+
+        static::assertArrayNotHasKey('key', $parameters);
         static::assertArrayHasKey('hash', $parameters);
     }