[9.x] Store SES message ID in X-SES-Message-ID header (#41615)

* Store SES message ID in X-SES-Message-ID header

* Using alias for Mockery

* Accidentally removed a line in the test

* Moving SES message ID retrieval outside of the try/catch block

* Style fix

* Last commit was an error

* Update SesTransport.php

Co-authored-by: Jon Baker <[email protected]>
Co-authored-by: Taylor Otwell <[email protected]>

Author: 3 people

src/Illuminate/Mail/Transport/SesTransport.php

@@ -57,7 +57,7 @@ protected function doSend(SentMessage $message): void
         }
 
         try {
-            $this->ses->sendRawEmail(
+            $result = $this->ses->sendRawEmail(
                 array_merge(
                     $options, [
                         'Source' => $message->getEnvelope()->getSender()->toString(),
@@ -75,6 +75,11 @@ protected function doSend(SentMessage $message): void
         } catch (AwsException $e) {
             throw new Exception('Request to AWS SES API failed.', $e->getCode(), $e);
         }
+
+        $messageId = $result->get('MessageId');
+
+        $message->getOriginalMessage()->getHeaders()->addHeader('X-Message-ID', $messageId);
+        $message->getOriginalMessage()->getHeaders()->addHeader('X-SES-Message-ID', $messageId);
     }
 
     /**

tests/Mail/MailSesTransportTest.php

@@ -57,7 +57,13 @@ public function testSend()
         $message->bcc('[email protected]');
 
         $client = m::mock(SesClient::class);
-        $client->shouldReceive('sendRawEmail')->once();
+        $sesResult = m::mock();
+        $sesResult->shouldReceive('get')
+            ->with('MessageId')
+            ->once()
+            ->andReturn('ses-message-id');
+        $client->shouldReceive('sendRawEmail')->once()
+            ->andReturn($sesResult);
 
         (new SesTransport($client))->send($message);
     }