Fix wrong sender address handling, body generation and wrong return types

Author: TKrisee

src/Mailers/O365/Office365Connector.php

@@ -69,7 +69,8 @@ public function sendMessageRequest(Email $message): Message
             $this->uploadLargeAttachments($message, $draft->getId());
 
             // Send the message
-            return $this->client->createRequest("POST", "/users/" . (current($message->getFrom())) . "/messages/" . $draft->getId() . "/send")
+            return $this->client->createRequest("POST", "/users/" . (current($message->getFrom())->getAddress()) . "/messages/" . $draft->getId() . "/send")
+                ->setReturnType(Message::class)
                 ->execute();
         }
 
@@ -81,8 +82,8 @@ public function sendMessageRequest(Email $message): Message
 
     protected function createDraftMessage(Email $message): Message
     {
-        return $this->client->createRequest("POST", "/users/" . (current($message->getFrom())) . "/messages")
-            ->attachBody($this->getBody($message, true))
+        return $this->client->createRequest("POST", "/users/" . (current($message->getFrom())->getAddress()) . "/messages")
+            ->attachBody($this->getBody($message, false, true))
             ->setReturnType(Message::class)
             ->execute();
     }
@@ -105,7 +106,7 @@ protected function uploadLargeAttachments(Email $message, string $draftId): void
                     'contentId' => $id
                 ];
 
-                $this->client->createRequest("POST", "/users/" . (current($message->getFrom())) . "/messages/" . $draftId . "/attachments")
+                $this->client->createRequest("POST", "/users/" . (current($message->getFrom())->getAddress()) . "/messages/" . $draftId . "/attachments")
                     ->attachBody($attachmentBody)
                     ->setReturnType(UploadSession::class)
                     ->execute();
@@ -125,7 +126,7 @@ protected function chunkUpload(Email $message, string $draftId, string $fileName
             ]
         ];
 
-        $uploadSession = $this->client->createRequest("POST", "/users/" . (current($message->getFrom())) . "/messages/" . $draftId . "/attachments/createUploadSession")
+        $uploadSession = $this->client->createRequest("POST", "/users/" . (current($message->getFrom())->getAddress()) . "/messages/" . $draftId . "/attachments/createUploadSession")
             ->attachBody($attachmentMessage)
             ->setReturnType(UploadSession::class)
             ->execute();
@@ -167,7 +168,7 @@ protected function chunkUpload(Email $message, string $draftId, string $fileName
 
     protected function getBodySize(Email $message): float
     {
-        $messageBody = $this->getBody($message);
+        $messageBody = $this->getBody($message, true);
         $messageBodyLength = mb_strlen(json_encode($messageBody, JSON_NUMERIC_CHECK), '8bit');
 
         return $messageBodyLength / self::BYTE_TO_MB; //byte -> mb
@@ -176,7 +177,7 @@ protected function getBodySize(Email $message): float
     /**
      * Get body for the message.
      */
-    protected function getBody(Email $message, bool $hasHugeAttachment = false): array
+    protected function getBody(Email $message, bool $withAttachments = false, bool $isDraft = false): array
     {
         $messageData = [
             'from' => [
@@ -196,12 +197,11 @@ protected function getBody(Email $message, bool $hasHugeAttachment = false): arr
             ]
         ];
 
-        if (!$hasHugeAttachment) {
+        if (!$isDraft) {
             $messageData = ['message' => $messageData];
         }
 
-
-        if (count($message->getAttachments()) > 0) {
+        if (count($message->getAttachments()) > 0 && $withAttachments) {
             $attachments = [];
             foreach ($message->getAttachments() as $attachment) {
                 $attachments[] = [