Add Message-Id to SentMessage when sending an email

Author: fabpot

SentMessage.php

@@ -22,6 +22,7 @@ class SentMessage
     private $original;
     private $raw;
     private $envelope;
+    private $messageId;
     private $debug = '';
 
     /**
@@ -31,9 +32,20 @@ public function __construct(RawMessage $message, Envelope $envelope)
     {
         $message->ensureValidity();
 
-        $this->raw = $message instanceof Message ? new RawMessage($message->toIterable()) : $message;
         $this->original = $message;
         $this->envelope = $envelope;
+
+        if ($message instanceof Message) {
+            $message = clone $message;
+            $headers = $message->getHeaders();
+            if (!$headers->has('Message-ID')) {
+                $headers->addIdHeader('Message-ID', $message->generateMessageId());
+            }
+            $this->messageId = $headers->get('Message-ID')->getId();
+            $this->raw = new RawMessage($message->toIterable());
+        } else {
+            $this->raw = $message;
+        }
     }
 
     public function getMessage(): RawMessage
@@ -51,6 +63,16 @@ public function getEnvelope(): Envelope
         return $this->envelope;
     }
 
+    public function setMessageId(string $id): void
+    {
+        $this->messageId = $id;
+    }
+
+    public function getMessageId(): string
+    {
+        return $this->messageId;
+    }
+
     public function getDebug(): string
     {
         return $this->debug;

Transport/AbstractApiTransport.php

@@ -24,7 +24,7 @@
  */
 abstract class AbstractApiTransport extends AbstractHttpTransport
 {
-    abstract protected function doSendApi(Email $email, Envelope $envelope): ResponseInterface;
+    abstract protected function doSendApi(SentMessage $sentMessage, Email $email, Envelope $envelope): ResponseInterface;
 
     protected function doSendHttp(SentMessage $message): ResponseInterface
     {
@@ -34,7 +34,7 @@ protected function doSendHttp(SentMessage $message): ResponseInterface
             throw new RuntimeException(sprintf('Unable to send message with the "%s" transport: %s', __CLASS__, $e->getMessage()), 0, $e);
         }
 
-        return $this->doSendApi($email, $message->getEnvelope());
+        return $this->doSendApi($message, $email, $message->getEnvelope());
     }
 
     protected function getRecipients(Email $email, Envelope $envelope): array