Skip to content

[9.x] Set SES MessageId to the sent message ID #41328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

[9.x] Set SES MessageId to the sent message ID #41328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ec7c8f
Set SES MessageId to the sent message ID
leandro-hermes Mar 3, 2022
075f93d
style fix
leandro-hermes Mar 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/Illuminate/Mail/Transport/SesTransport.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public function __construct(SesClient $ses, $options = [])
protected function doSend(SentMessage $message): void
{
try {
$this->ses->sendRawEmail(
$result = $this->ses->sendRawEmail(
array_merge(
$this->options, [
'Source' => $message->getEnvelope()->getSender()->toString(),
Expand All @@ -58,6 +58,8 @@ protected function doSend(SentMessage $message): void
} catch (AwsException $e) {
throw new Exception('Request to AWS SES API failed.', $e->getCode(), $e);
}

$message->setMessageId($result->get('MessageId'));
}

/**
Expand Down
10 changes: 8 additions & 2 deletions tests/Mail/MailSesTransportTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace Illuminate\Tests\Mail;

use Aws\Result;
use Aws\Ses\SesClient;
use Illuminate\Config\Repository;
use Illuminate\Container\Container;
Expand Down Expand Up @@ -56,10 +57,15 @@ public function testSend()
$message->to('[email protected]');
$message->bcc('[email protected]');

$result = m::mock(Result::class);
$result->shouldReceive('get')->once()->with('MessageId')->andReturn('123');

$client = m::mock(SesClient::class);
$client->shouldReceive('sendRawEmail')->once();
$client->shouldReceive('sendRawEmail')->once()->andReturn($result);

$sentMessage = (new SesTransport($client))->send($message);

(new SesTransport($client))->send($message);
$this->assertEquals('123', $sentMessage->getMessageId());
}

public function testSesLocalConfiguration()
Expand Down