Fix namespace url

tomas-kulhanek · May 24, 2024 · 34c5a97 · 34c5a97
1 parent 8c2bec1
commit 34c5a97
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 9 deletions.
diff --git a/src/Connector.php b/src/Connector.php
@@ -379,6 +379,8 @@ protected function send(
         if (empty($response)) {
             throw new ConnectionException('The response is empty');
         }
+        $response = str_replace('http://isds.czechpoint.cz/v20', 'https://isds.czechpoint.cz/v20', $response);
+
         return $this->serializer->deserialize($response, $responseClass, 'xml');
     }
 }
diff --git a/src/DTO/Request/GetListOfReceivedMessages.php b/src/DTO/Request/GetListOfReceivedMessages.php
@@ -10,7 +10,7 @@
 use TomasKulhanek\CzechDataBox\Traits\StatusFilter;
 
 #[Serializer\XmlNamespace(uri: 'https://isds.czechpoint.cz/v20', prefix: 'p')]
-#[Serializer\XmlRoot(namespace: 'https://isds.czechpoint.cz/v20', name: 'GetListOfReceivedMessages')]
+#[Serializer\XmlRoot(name: 'GetListOfReceivedMessages', namespace: 'https://isds.czechpoint.cz/v20')]
 class GetListOfReceivedMessages implements IRequest
 {
     use StatusFilter;

diff --git a/src/DTO/Response/AuthenticateMessage.php b/src/DTO/Response/AuthenticateMessage.php
@@ -8,7 +8,7 @@
 use TomasKulhanek\CzechDataBox\Traits\DataMessageStatus;
 
 #[Serializer\XmlNamespace(uri: 'https://isds.czechpoint.cz/v20', prefix: 'p')]
-#[Serializer\XmlRoot(name: 'AuthenticateMessageResponse')]
+#[Serializer\XmlRoot(name: 'AuthenticateMessageResponse', namespace: 'https://isds.czechpoint.cz/v20')]
 class AuthenticateMessage extends IResponse
 {
     use DataMessageStatus;

diff --git a/src/DTO/Response/MessageDownload.php b/src/DTO/Response/MessageDownload.php
@@ -10,7 +10,7 @@
 use TomasKulhanek\CzechDataBox\Traits\DataMessageStatus;
 
 #[Serializer\XmlNamespace(uri: 'https://isds.czechpoint.cz/v20', prefix: 'p')]
-#[Serializer\XmlRoot(namespace: 'https://isds.czechpoint.cz/v20', name: 'MessageDownloadResponse')]
+#[Serializer\XmlRoot(name: 'MessageDownloadResponse', namespace: 'https://isds.czechpoint.cz/v20')]
 class MessageDownload extends IResponse
 {
     use DataMessageStatus;

diff --git a/src/DTO/ReturnedMessage.php b/src/DTO/ReturnedMessage.php
@@ -9,7 +9,7 @@
 use Symfony\Component\Validator\Constraints as Assert;
 use TomasKulhanek\CzechDataBox\Traits\QTimestamp;
 
-#[Serializer\XmlRoot(namespace: 'https://isds.czechpoint.cz/v20', name: 'dmReturnedMessage')]
+#[Serializer\XmlRoot(name: 'dmReturnedMessage', namespace: 'https://isds.czechpoint.cz/v20')]
 #[Serializer\XmlNamespace(uri: 'https://isds.czechpoint.cz/v20', prefix: 'p')]
 class ReturnedMessage
 {

diff --git a/tests/Integration/DataMessageTest.php b/tests/Integration/DataMessageTest.php
@@ -40,8 +40,8 @@ public function testAuthenticateMessage(): void
         $message->setDataMessage($this->getOriginalMessage());
         $account = $this->createFOAccount();
         $response = $client->authenticateMessage($account, $message);
-        self::assertFalse($response->getStatus()->isOk(), $response->getStatus()->getMessage());
-        self::assertTrue($response->isAuthenticated());
+        self::assertTrue($response->getStatus()->isOk(), $response->getStatus()->getMessage());
+        self::assertFalse($response->isAuthenticated());
     }
 
     public function testVerifyMessage(): void
@@ -79,14 +79,15 @@ public function testMessageDownload(): void
         $listrecRes = $client->getListOfReceivedMessages($ovmAccount, $listrec);
         self::assertTrue($listrecRes->getStatus()->isOk(), $listrecRes->getStatus()->getMessage());
 
-        $client = $this->createGuzzleConnector();
+        $messageId = $listrecRes->getRecord()[0]->getDataMessageId();
+
         $message = new MarkMessageAsDownloaded();
-        $message->setDataMessageId($listrecRes->getRecord()[0]->getDataMessageId());
+        $message->setDataMessageId($messageId);
         $response = $client->markMessageAsDownloaded($ovmAccount, $message);
         self::assertTrue($response->getStatus()->isOk(), $response->getStatus()->getMessage());
 
         $request = new MessageDownload();
-        $request->setDataMessageId($listrecRes->getRecord()[0]->getDataMessageId());
+        $request->setDataMessageId($messageId);
 
         $response = $client->messageDownload($ovmAccount, $request);