fix: send resends and releases to the right recipients (#33)

Author: jszobody

readme.md

@@ -909,9 +909,11 @@ Postmaster::resend($message);
 Postmaster::resend($messageId);
 ```
 
-The new send carries over everything we can reconstruct from the recorded
-row — sender, To/Cc/Bcc envelope, subject, html and text bodies, related /
-recipient / tenant context, tags — and gets a `resent` tag of its own. The
+The new send goes only to the recipient on that row, in To. Other recipients of
+the original are not sent it again, so resend a Cc or Bcc row to reach that
+person alone. It carries over everything else we can reconstruct from the
+recorded row — sender, subject, html and text bodies, related / recipient /
+tenant context, tags — and gets a `resent` tag of its own. The
 new row's `resent_from_id` points back to the original so the chain is
 queryable:
 

resources/views/message.blade.php

@@ -54,7 +54,7 @@
             @if ($canRelease)
                 <x-postmaster::confirm-action
                     :action="route('postmaster.messages.release', $message)"
-                    :confirm="'Release this sandboxed email and send it for real to '.$message->to_address.'? This cannot be undone.'"
+                    :confirm="'Release this sandboxed email and send it for real to '.implode(', ', $message->envelopeAddresses()).'? This cannot be undone.'"
                     :title="$incomplete"
                     label="Release"/>
             @endif

src/Mail/ReleasedMessage.php

@@ -37,10 +37,19 @@ public function build(): static
             $this->from($this->record->from_address);
         }
 
-        $this->to($this->record->to_address);
-
+        // Release marks every sibling row sent, so it sends the original
+        // envelope, whichever row the operator released from.
         $recipients = $this->record->recipients ?? [];
 
+        foreach ($recipients['to'] ?? [] as $to) {
+            $this->to($to['address']);
+        }
+
+        // A row with no recorded envelope can only name its own recipient.
+        if ($recipients === []) {
+            $this->to($this->record->to_address);
+        }
+
         foreach ($recipients['cc'] ?? [] as $cc) {
             $this->cc($cc['address']);
         }

src/Mail/ResentMessage.php

@@ -34,18 +34,11 @@ public function build(): static
             $this->from($this->record->from_address);
         }
 
+        // A resend starts from one recipient's row, so it goes to that
+        // recipient alone. Copying the original Cc/Bcc would send it again
+        // to people nobody asked to resend to, past their suppression checks.
         $this->to($this->record->to_address);
 
-        $recipients = $this->record->recipients ?? [];
-
-        foreach ($recipients['cc'] ?? [] as $cc) {
-            $this->cc($cc['address']);
-        }
-
-        foreach ($recipients['bcc'] ?? [] as $bcc) {
-            $this->bcc($bcc['address']);
-        }
-
         if ($this->record->subject) {
             $this->subject($this->record->subject);
         }

src/Models/EmailMessage.php

@@ -157,6 +157,23 @@ public function hasStoredContent(): bool
         return (bool) ($this->html_body ?: $this->text_body);
     }
 
+    /**
+     * Every To, Cc, and Bcc address of the original send, in that order.
+     * Falls back to this row's own address when no envelope was stored.
+     *
+     * @return list<string>
+     */
+    public function envelopeAddresses(): array
+    {
+        $recipients = $this->recipients ?? [];
+
+        if ($recipients === []) {
+            return array_filter([$this->to_address]);
+        }
+
+        return array_column([...$recipients['to'] ?? [], ...$recipients['cc'] ?? [], ...$recipients['bcc'] ?? []], 'address');
+    }
+
     /**
      * Whether this message's recipient is on the local suppression list.
      * False when there's no recipient recorded at all — callers asking this
@@ -450,9 +467,9 @@ public function resends(): HasMany
     }
 
     /**
-     * Replay this message through the configured mailer, preserving its
-     * sender, recipients, subject, bodies, and tracking context (plus a
-     * `resent` tag of its own). The new row links back to this one via
+     * Replay this message to this row's recipient alone, preserving its
+     * sender, subject, bodies, and tracking context (plus a `resent` tag
+     * of its own). The new row links back to this one via
      * resent_from_id. Requires stored content; attachments come along when
      * their bytes are still stored.
      *

src/Postmaster.php

@@ -456,9 +456,10 @@ public function resentFrom(EmailMessage|int $message): Closure
 
     /**
      * Replay a previously recorded EmailMessage through the configured
-     * mailer, preserving every aspect of the original we can reconstruct:
-     * sender, To/Cc/Bcc envelope, subject, html and text bodies, related /
-     * recipient / tenant context, and tags (plus a `resent` tag of its own).
+     * mailer to that row's recipient alone, preserving every other aspect
+     * of the original we can reconstruct: sender, subject, html and text
+     * bodies, related / recipient / tenant context, and tags (plus a
+     * `resent` tag of its own). Other Cc/Bcc recipients are not re-sent.
      * The new send is linked back to the original via resent_from_id, which
      * the dashboard's chain card walks to show the full retry history.
      *

tests/ResendTest.php

@@ -131,6 +131,30 @@ public function testResendChainCalledOnTheRootStillReturnsAllDescendants()
         $this->assertSame($original->id, $chain[0]->id);
     }
 
+    /**
+     * The dashboard asks "Resend this email to {address}?" on one
+     * recipient's row, so only that recipient should get it again.
+     */
+    public function testResendGoesOnlyToTheRecipientWhoseRowWasResent()
+    {
+        Mail::html('<p>Hello all</p>', function ($m) {
+            $m->to('to@example.com')->cc('cc@example.com')->bcc('bcc@example.com')->subject('Team update');
+        });
+
+        foreach (['to', 'cc', 'bcc'] as $role) {
+            Postmaster::resend(EmailMessage::where('recipient_role', $role)->whereNull('resent_from_id')->firstOrFail());
+
+            $sent = Mail::mailer('array')->getSymfonyTransport()->messages()->last()->getOriginalMessage();
+            $this->assertSame(["$role@example.com"], array_map(fn ($a) => $a->getAddress(), $sent->getTo()), $role);
+            $this->assertSame([], $sent->getCc(), $role);
+            $this->assertSame([], $sent->getBcc(), $role);
+        }
+
+        $resends = EmailMessage::whereNotNull('resent_from_id')->get();
+        $this->assertSame(['to@example.com', 'cc@example.com', 'bcc@example.com'], $resends->pluck('to_address')->all());
+        $this->assertSame(['to', 'to', 'to'], $resends->pluck('recipient_role')->all());
+    }
+
     public function testTrackingResentFromIsRespected()
     {
         Mail::raw('first send', function ($m) {

tests/SandboxReleaseTest.php

@@ -206,6 +206,37 @@ public function testReleaseTransitionsEveryEnvelopeSibling()
         $this->assertStringStartsNotWith('sandboxed-', (string) $fresh->first()->provider_message_id);
     }
 
+    /**
+     * Release flips every sibling row to sent, so the send must reach the
+     * whole original envelope, whichever row the operator released from.
+     */
+    public function testReleaseFromAnyRowSendsTheOriginalEnvelope()
+    {
+        Mail::html('<p>Hello all</p>', function ($m) {
+            $m->to(['to@example.com', 'to2@example.com'])->cc('cc@example.com')->bcc('bcc@example.com')->subject('Team update');
+        });
+
+        Postmaster::release(EmailMessage::where('recipient_role', 'bcc')->firstOrFail());
+
+        $sent = Mail::mailer('array')->getSymfonyTransport()->messages()->last()->getOriginalMessage();
+        $addresses = fn (array $list) => array_map(fn ($a) => $a->getAddress(), $list);
+        $this->assertSame(['to@example.com', 'to2@example.com'], $addresses($sent->getTo()));
+        $this->assertSame(['cc@example.com'], $addresses($sent->getCc()));
+        $this->assertSame(['bcc@example.com'], $addresses($sent->getBcc()));
+    }
+
+    public function testDashboardReleaseConfirmationNamesEveryRecipient()
+    {
+        Postmaster::auth(fn () => true);
+        Mail::html('<p>Hello all</p>', function ($m) {
+            $m->to('to@example.com')->cc('cc@example.com')->subject('Team update');
+        });
+
+        $this->get('/postmaster/messages/'.EmailMessage::where('recipient_role', 'cc')->firstOrFail()->getKey())
+            ->assertOk()
+            ->assertSee('send it for real to to@example.com, cc@example.com?');
+    }
+
     public function testDashboardShowsReleaseOnASandboxedMessage()
     {
         Postmaster::auth(fn () => true);