Use headers to send elastic ids and enable transactional emails

Author: seinoxygen

config/elasticemail.php

@@ -21,6 +21,16 @@
     */
     'account' => env('ELASTIC_ACCOUNT'),
 
+    /*
+    |--------------------------------------------------------------------------
+    | Elastic Email Account Email
+    |--------------------------------------------------------------------------
+    |
+    | This value is the account email provided by Elastic Email.
+    |
+    */
+    'transactional' => env('ELASTIC_IS_TRANSACTIONAL', false),
+
     /*
     |--------------------------------------------------------------------------
     | Elastic Email Webhook Secret

src/ElasticTransport.php

@@ -27,6 +27,13 @@ class ElasticTransport extends Transport
      */
     protected $account;
 
+
+    /**
+     * If the email is transactional.
+     * @var string
+     */
+    protected $transactional;
+
     /**
      * THe Elastic Email API end-point.
      * @var string
@@ -42,11 +49,12 @@ class ElasticTransport extends Transport
      *
      * @return void
      */
-    public function __construct(ClientInterface $client, $key, $account)
+    public function __construct(ClientInterface $client, $config)
     {
         $this->client = $client;
-        $this->key = $key;
-        $this->account = $account;
+        $this->key = $config['key'];
+        $this->account = $config['account'];
+        $this->transactional = $config['transactional'];
     }
 
     /**
@@ -56,6 +64,11 @@ public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = NUL
     {
         $this->beforeSendPerformed($message);
 
+        $isTransactional = $this->transactional;
+        if(!is_null($message->getHeaders()->get('X-Transactional'))){
+            $isTransactional = $message->getHeaders()->get('X-Transactional')->getFieldBody();
+        }
+
         $data = [
             'api_key' => $this->key,
             'account' => $this->account,
@@ -66,13 +79,31 @@ public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = NUL
             'msgFromName' => $this->getFromAddress($message)['name'],
             'from' => $this->getFromAddress($message)['email'],
             'fromName' => $this->getFromAddress($message)['name'],
+            'replyTo' => $this->getReplyToAddress($message)['email'],
+            'replyToName' => $this->getReplyToAddress($message)['name'],
             'to' => $this->getEmailAddresses($message),
             'subject' => $message->getSubject(),
             'body_html' => $message->getBody(),
-            'body_text' => $this->getText($message)
+            'body_text' => $this->getText($message),
+            'isTransactional' => $isTransactional
         ];
 
         $attachments = $message->getChildren();
+        
+        $response = $this->sendEmail($data, $attachments);
+
+        // Inject the response data into the message headers.
+        if($response) {
+            $message->getHeaders()->addTextHeader('X-Message-ID', $response->messageid);
+            $message->getHeaders()->addTextHeader('X-Transaction-ID', $response->transactionid);
+        }
+
+        $this->sendPerformed($message);
+
+        return $response;
+    }
+
+    protected function sendEmail(array $data, array $attachments = []){
         if (!empty($attachments)) {
             $options['multipart'] = $this->parseMultipart($attachments, $data);
         } else {
@@ -87,20 +118,25 @@ public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = NUL
             $url = str_replace('https:', 'http:', $url);
         }
 
-        $result = $this->client->request('POST', $url, $options);
+        try {
+            $result = $this->client->request('POST', $url, $options);
+        } catch (\Exception $e) {
+            throw $e;
+        }
 
-        // Inject the response data into the message instance.
         if($result->getStatusCode() == 200) {
             $response = $result->getBody()->getContents();
             $response = json_decode($response);
+            
             if($response->success) {
-                $message->elasticemail = $response->data;
+                return $response->data;
+            }
+            else{
+                throw new \Exception($response->error);
             }
         }
 
-        $this->sendPerformed($message);
-
-        return $result;
+        return false;
     }
 
     /**
@@ -153,6 +189,23 @@ protected function getEmailAddresses(Swift_Mime_SimpleMessage $message, $method
         return '';
     }
 
+    /**
+     * @param \Swift_Mime_Message $message
+     *
+     * @return array
+     */
+    protected function getReplyToAddress(Swift_Mime_SimpleMessage $message)
+    {
+        if (!$message->getReplyTo()) {
+            return $this->getFromAddress($message);
+        }
+
+        return [
+            'email' => array_keys($message->getReplyTo())[0],
+            'name' => array_values($message->getReplyTo())[0],
+        ];
+    }
+
     /**
      * Parse the attachments and add them to the multipart array.
      *

src/Listeners/OnEmailSent.php

@@ -16,8 +16,8 @@ public function handle(MessageSent $event)
         $body           = $this->parseBodyText($event->message->getBody());
 
         $log = ElasticEmailOutbound::create([
-            'message_id' => $event->message->elasticemail->messageid,
-            'transaction_id' => $event->message->elasticemail->transactionid,
+            'message_id' => $event->message->getHeaders()->get('X-Message-ID')->getFieldBody() ?? null,
+            'transaction_id' => $event->message->getHeaders()->get('X-Transaction-ID')->getFieldBody() ?? null,
             'from' => $from[0],
             'to' => json_encode($toArr),
             'cc' => $ccArr ? json_encode($ccArr) : NULL,

src/TransportManager.php

@@ -8,13 +8,11 @@ class TransportManager extends MailManager
 {
     protected function createElasticEmailTransport()
     {
-        
-        $config = $this->app['config']->get('services.elastic_email', []);
+        $config = array_merge($this->app['config']->get('services.elastic_email', []), $this->app['config']->get('elasticemail', []));
 
         return new ElasticTransport(
             $this->guzzle($config),
-            $config['key'],
-            $config['account']
+            $config
         );
     }
 }