Merge pull request #18 from superbrave/transaction-status-fix

Transaction status fix
superbrave · Jan 19, 2021 · e843e10 · e843e10
2 parents a92445e + c53a7cd
commit e843e10
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 17 deletions.
diff --git a/src/Message/AbstractRequest.php b/src/Message/AbstractRequest.php
@@ -31,13 +31,13 @@ public function getData(): array
      * Send the request to the API of the Payment Service Provider.
      * The base url and the authentication headers are automatically added.
      *
-     * @param string $method
-     * @param string $urlPath
-     * @param array  $data
+     * @param string     $method
+     * @param string     $urlPath
+     * @param array|null $data
      *
      * @return ResponseInterface
      */
-    protected function sendRequest(string $method, string $urlPath, array $data): ResponseInterface
+    protected function sendRequest(string $method, string $urlPath, ?array $data = null): ResponseInterface
     {
         $securityHash = $this->getSecurityHash($method, $urlPath, $data);
         $headers = $this->getAuthenticationHeaders($securityHash);
@@ -76,10 +76,10 @@ protected function getResponseBody(): array
     /**
      * Safety hash from icepay, to be generated after putting in all the data.
      *
-     * @param string          $requestMethod
-     * @param string          $urlPath
-     * @param array|\stdClass $data
-     * @param bool            $urlIsFullUrl  = false. True to have $urlPath be the absolute (full) url
+     * @param string               $requestMethod
+     * @param string               $urlPath
+     * @param array|\stdClass|null $data
+     * @param bool                 $urlIsFullUrl  = false. True to have $urlPath be the absolute (full) url
      *
      * @return string
      */
@@ -96,7 +96,10 @@ protected function getSecurityHash(
             $fullUrl = $urlPath;
         }
 
-        $toBeHashed = $fullUrl.$requestMethod.$contractProfileId.json_encode($data);
+        $toBeHashed = $fullUrl.$requestMethod.$contractProfileId;
+        if ($data !== null) {
+            $toBeHashed .= json_encode($data);
+        }
 
         $hash = hash_hmac(
             'sha256',

diff --git a/src/Message/CompleteAuthoriseAndCaptureRequest.php b/src/Message/CompleteAuthoriseAndCaptureRequest.php
@@ -29,12 +29,11 @@ public function getData(): array
     public function sendData($data): ResponseInterface
     {
         $this->sendRequest(
-            Request::METHOD_POST,
+            Request::METHOD_GET,
             sprintf(
                 '/transaction/%s',
                 $this->getTransactionReference()
-            ),
-            $data
+            )
         );
 
         return new CompleteAuthoriseAndCaptureResponse(

diff --git a/src/Message/TransactionStatusRequest.php b/src/Message/TransactionStatusRequest.php
@@ -34,12 +34,11 @@ public function sendData($data): ResponseInterface
         }
 
         $this->sendRequest(
-            Request::METHOD_POST,
+            Request::METHOD_GET,
             sprintf(
                 '/transaction/%s',
                 $this->getTransactionReference()
-            ),
-            $data
+            )
         );
 
         return new TransactionStatusResponse(

diff --git a/tests/Message/CompleteAuthoriseAndCaptureRequestTest.php b/tests/Message/CompleteAuthoriseAndCaptureRequestTest.php
@@ -59,7 +59,7 @@ public function testSendData(): void
         $this->assertInstanceOf(CompleteAuthoriseAndCaptureResponse::class, $response);
 
         $expectedRequest = new Request(
-            SymfonyRequest::METHOD_POST,
+            SymfonyRequest::METHOD_GET,
             'https://www.superbrave.nl/transaction/e7ca29c8-f1f4-4a4c-a968-0f9667d0519d'
         );
 

diff --git a/tests/Message/TransactionStatusRequestTest.php b/tests/Message/TransactionStatusRequestTest.php
@@ -59,7 +59,7 @@ public function testSendData(): void
         $this->assertInstanceOf(TransactionStatusResponse::class, $response);
 
         $expectedRequest = new Request(
-            SymfonyRequest::METHOD_POST,
+            SymfonyRequest::METHOD_GET,
             'https://www.superbrave.nl/transaction/e7ca29c8-f1f4-4a4c-a968-0f9667d0519d'
         );