fix: set correct cc and bcc

motze92 · Oct 26, 2020 · 25c6db2 · 25c6db2
1 parent 4ac68b6
commit 25c6db2
Showing 1 changed file with 47 additions and 1 deletion.
diff --git a/src/Transport/Office365MailTransport.php b/src/Transport/Office365MailTransport.php
@@ -131,6 +131,8 @@ protected function getBody(Swift_Mime_SimpleMessage $message, $withAttachments =
                 ]
             ],
             'toRecipients' => $this->getTo($message),
+            'ccRecipients' => $this->getCc($message),
+            'bccRecipients' => $this->getBcc($message),
             'subject' => $message->getSubject(),
             'body' => [
                 'contentType' => $message->getBodyContentType() == "text/html" ? 'html' : 'text',
@@ -167,7 +169,51 @@ protected function getBody(Swift_Mime_SimpleMessage $message, $withAttachments =
      */
     protected function getTo(Swift_Mime_SimpleMessage $message)
     {
-        return collect($this->allContacts($message))->map(function ($display, $address) {
+        return collect((array) $message->getTo())->map(function ($display, $address) {
+            return $display ? [
+                'emailAddress' => [
+                    'address' => $address,
+                    'name' => $display
+                ]
+            ] : [
+                'emailAddress' => [
+                    'address' => $address
+                ]
+            ];
+        })->values()->toArray();
+    }
+
+    /**
+     * Get the "Cc" payload field for the API request.
+     *
+     * @param \Swift_Mime_SimpleMessage $message
+     * @return string
+     */
+    protected function getCc(Swift_Mime_SimpleMessage $message)
+    {
+        return collect((array) $message->getCc())->map(function ($display, $address) {
+            return $display ? [
+                'emailAddress' => [
+                    'address' => $address,
+                    'name' => $display
+                ]
+            ] : [
+                'emailAddress' => [
+                    'address' => $address
+                ]
+            ];
+        })->values()->toArray();
+    }
+
+    /**
+     * Get the "Bcc" payload field for the API request.
+     *
+     * @param \Swift_Mime_SimpleMessage $message
+     * @return string
+     */
+    protected function getBcc(Swift_Mime_SimpleMessage $message)
+    {
+        return collect((array) $message->getBcc())->map(function ($display, $address) {
             return $display ? [
                 'emailAddress' => [
                     'address' => $address,