Store the SES message ID in the header X-SES-Message-ID after the mes…

…sage has been sent.
laravel · Nov 11, 2016 · c15e114 · c15e114
1 parent 8eabb73
commit c15e114
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 3 deletions.
diff --git a/src/Illuminate/Mail/Transport/SesTransport.php b/src/Illuminate/Mail/Transport/SesTransport.php
@@ -32,12 +32,15 @@ public function send(Swift_Mime_Message $message, &$failedRecipients = null)
     {
         $this->beforeSendPerformed($message);
 
-        $this->ses->sendRawEmail([
+        $headers = $message->getHeaders();
+
+        // Send the message to SES, storing the SES message id in X-SES-Message-ID
+        $headers->addTextHeader('X-SES-Message-ID',$this->ses->sendRawEmail([
             'Source' => key($message->getSender() ?: $message->getFrom()),
             'RawMessage' => [
                 'Data' => $message->toString(),
             ],
-        ]);
+        ])->get('MessageId'));
 
         $this->sendPerformed($message);
 

diff --git a/tests/Mail/MailSesTransportTest.php b/tests/Mail/MailSesTransportTest.php
@@ -45,13 +45,39 @@ public function testSend()
             ->getMock();
         $transport = new SesTransport($client);
 
+        // Generate a messageId for our mock to return to ensure that the post-sent message
+        // has X-SES-Message-ID in its headers
+        $messageId = str_random(32);
+        $sendRawEmailMock = new sendRawEmailMock($messageId);
         $client->expects($this->once())
             ->method('sendRawEmail')
             ->with($this->equalTo([
                 'Source' => 'myself@example.com',
                 'RawMessage' => ['Data' => (string) $message],
-            ]));
+            ]))
+            ->willReturn($sendRawEmailMock);
 
         $transport->send($message);
+        $this->assertEquals($messageId, $message->getHeaders()->get('X-SES-Message-ID')->getFieldBody());
     }
 }
+
+class sendRawEmailMock {
+
+    protected $getResponse = null;
+
+    public function __construct($responseValue)
+    {
+        $this->getResponse = $responseValue;
+    }
+
+    /**
+     * Mock the get() call for the sendRawEmail response
+     * @param  [type] $key [description]
+     * @return [type]      [description]
+     */
+    public function get($key)
+    {
+        return $this->getResponse;
+    }
+}