Add new attributes to Infobip API transport to support reporting behavior

ndousson · ndousson · commit 2ade00d3e899 · 2023-02-22T16:25:10.000+01:00
diff --git a/src/Symfony/Component/Mailer/Bridge/Infobip/CHANGELOG.md b/src/Symfony/Component/Mailer/Bridge/Infobip/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.3
+---
+
+ * Add infobip reporting behavior thanks to new attributes support
+
 6.2
 ---
 
diff --git a/src/Symfony/Component/Mailer/Bridge/Infobip/Tests/Transport/InfobipApiTransportTest.php b/src/Symfony/Component/Mailer/Bridge/Infobip/Tests/Transport/InfobipApiTransportTest.php
@@ -241,6 +241,51 @@ public function testSendEmailWithAttachmentsShouldCalledInfobipWithTheRightParam
         );
     }
 
+    public function testSendEmailWithHeadersShouldCalledInfobipWithTheRightParameters()
+    {
+        $email = $this->basicValidEmail();
+        $email->getHeaders()
+            ->addTextHeader('intermediateReport', 'true')
+            ->addTextHeader('notifyUrl', 'https://foo.bar')
+            ->addTextHeader('notifyContentType', 'application/json')
+            ->addTextHeader('messageId', 'RANDOM-CUSTOM-ID');
+
+        $this->transport->send($email);
+
+        $options = $this->response->getRequestOptions();
+        $this->arrayHasKey('body');
+        $this->assertStringMatchesFormat(<<<'TXT'
+            %a
+            --%s
+            Content-Type: text/plain; charset=utf-8
+            Content-Transfer-Encoding: 8bit
+            Content-Disposition: form-data; name="intermediateReport"
+
+            true
+            --%s
+            Content-Type: text/plain; charset=utf-8
+            Content-Transfer-Encoding: 8bit
+            Content-Disposition: form-data; name="notifyUrl"
+
+            https://foo.bar
+            --%s
+            Content-Type: text/plain; charset=utf-8
+            Content-Transfer-Encoding: 8bit
+            Content-Disposition: form-data; name="notifyContentType"
+
+            application/json
+            --%s
+            Content-Type: text/plain; charset=utf-8
+            Content-Transfer-Encoding: 8bit
+            Content-Disposition: form-data; name="messageId"
+
+            RANDOM-CUSTOM-ID
+            --%s--
+            TXT,
+            $options['body']
+        );
+    }
+
     public function testSendMinimalEmailWithSuccess()
     {
         $email = (new Email())
@@ -357,6 +402,31 @@ public function testSendEmailWithAttachmentsWithSuccess()
         );
     }
 
+    public function testSendEmailWithHeadersWithSuccess()
+    {
+        $email = $this->basicValidEmail();
+        $email->getHeaders()
+            ->addTextHeader('intermediateReport', 'true')
+            ->addTextHeader('notifyUrl', 'https://foo.bar')
+            ->addTextHeader('notifyContentType', 'application/json')
+            ->addTextHeader('messageId', 'RANDOM-CUSTOM-ID');
+
+        $sentMessage = $this->transport->send($email);
+
+        $this->assertInstanceOf(SentMessage::class, $sentMessage);
+        $this->assertStringMatchesFormat(
+            <<<'TXT'
+            %a
+            intermediateReport: true
+            notifyUrl: https://foo.bar
+            notifyContentType: application/json
+            messageId: RANDOM-CUSTOM-ID
+            %a
+            TXT,
+            $sentMessage->toString()
+        );
+    }
+
     public function testSentMessageShouldCaptureInfobipMessageId()
     {
         $this->response = new MockResponse('{"messages": [{"messageId": "somexternalMessageId0"}]}');
diff --git a/src/Symfony/Component/Mailer/Bridge/Infobip/Transport/InfobipApiTransport.php b/src/Symfony/Component/Mailer/Bridge/Infobip/Transport/InfobipApiTransport.php
@@ -123,6 +123,24 @@ private function formDataPart(Email $email, Envelope $envelope): FormDataPart
 
         $this->attachmentsFormData($fields, $email);
 
+        $headers = $email->getHeaders();
+
+        if ($headers->has('intermediateReport')) {
+            $fields['intermediateReport'] = $headers->getHeaderBody('intermediateReport');
+        }
+
+        if ($headers->has('notifyUrl')) {
+            $fields['notifyUrl'] = $headers->getHeaderBody('notifyUrl');
+        }
+
+        if ($headers->has('notifyContentType')) {
+            $fields['notifyContentType'] = $headers->getHeaderBody('notifyContentType');
+        }
+
+        if ($headers->has('messageId')) {
+            $fields['messageId'] = $headers->getHeaderBody('messageId');
+        }
+
         return new FormDataPart($fields);
     }
 
