Merge pull request #270 from opcodesio/bug/mail-preview-improvements

bug fixes for mail previews
opcodesio · Aug 25, 2023 · 1e27934 · 1e27934
2 parents 579d5f4 + a960413
commit 1e27934
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/src/Logs/LaravelLog.php b/src/Logs/LaravelLog.php
@@ -148,15 +148,25 @@ protected function extractContextsFromFullText(): void
 
     protected function extractMailPreview(): void
     {
-        $isMail = Str::contains($this->text, 'To:')
-            && Str::contains($this->text, 'From:')
-            && Str::contains($this->text, 'MIME-Version: 1.0');
+        $possibleParts = preg_split('/[^\r]\n/', $this->text);
+        $part = null;
+
+        foreach ($possibleParts as $possiblePart) {
+            if (
+                Str::contains($this->text, 'To:')
+                && Str::contains($this->text, 'From:')
+                && Str::contains($this->text, 'MIME-Version: 1.0')
+            ) {
+                $part = $possiblePart;
+                break;
+            }
+        }
 
-        if (! $isMail) {
+        if (! $part) {
             return;
         }
 
-        $message = Message::fromString($this->text);
+        $message = Message::fromString($part);
 
         $this->extra['mail_preview'] = [
             'id' => $message->getId() ?: null,

diff --git a/tests/Unit/LaravelLogs/LaravelLogsTest.php b/tests/Unit/LaravelLogs/LaravelLogsTest.php
@@ -39,6 +39,8 @@
 
 ------=_Part_1_1234567890--
 EOF;
+    // The email string (as per RFC 5322) actually needs to use \r\n sequence instead of \n
+    $messageString = str_replace("\n", "\r\n", $messageString);
 
     $log = new LaravelLog($messageString);