Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 19 additions & 0 deletions src/Illuminate/Mail/Transport/SesV2Transport.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ protected function doSend(SentMessage $message): void
$options['ListManagementOptions'] = $listManagementOptions;
}

if ($tenantName = $this->tenantName($message)) {
$options['TenantName'] = $tenantName;
}

foreach ($message->getOriginalMessage()->getHeaders()->all() as $header) {
if ($header instanceof MetadataHeader) {
$options['EmailTags'][] = ['Name' => $header->getKey(), 'Value' => $header->getValue()];
Expand Down Expand Up @@ -114,6 +118,21 @@ protected function listManagementOptions(SentMessage $message)
}
}

/**
* Extract the SES tenant name, if applicable.
*
* @param \Symfony\Component\Mailer\SentMessage $message
* @return string|null
*/
protected function tenantName(SentMessage $message)
{
if ($header = $message->getOriginalMessage()->getHeaders()->get('X-SES-TENANT-NAME')) {
return $header->getBodyAsString() ?: null;
}

return null;
}

/**
* Get the Amazon SES V2 client for the SesV2Transport instance.
*
Expand Down
47 changes: 47 additions & 0 deletions tests/Mail/MailSesV2TransportTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,53 @@ public function testSend(): void
(new SesV2Transport($client))->send($message);
}

public function testSendWithTenantName(): void
{
$message = new Email();
$message->subject('Foo subject');
$message->text('Bar body');
$message->sender('myself@example.com');
$message->to('me@example.com');
$message->getHeaders()->addTextHeader('X-SES-TENANT-NAME', 'my-tenant');

$client = m::mock(SesV2Client::class);
$sesResult = m::mock();
$sesResult->shouldReceive('get')
->with('MessageId')
->once()
->andReturn('ses-message-id');
$client->shouldReceive('sendEmail')->once()
->with(m::on(function ($arg) {
return $arg['TenantName'] === 'my-tenant';
}))
->andReturn($sesResult);

(new SesV2Transport($client))->send($message);
}

public function testSendWithoutTenantNameDoesNotSetTheOption(): void
{
$message = new Email();
$message->subject('Foo subject');
$message->text('Bar body');
$message->sender('myself@example.com');
$message->to('me@example.com');

$client = m::mock(SesV2Client::class);
$sesResult = m::mock();
$sesResult->shouldReceive('get')
->with('MessageId')
->once()
->andReturn('ses-message-id');
$client->shouldReceive('sendEmail')->once()
->with(m::on(function ($arg) {
return ! array_key_exists('TenantName', $arg);
}))
->andReturn($sesResult);

(new SesV2Transport($client))->send($message);
}

public function testSendError(): void
{
$message = new Email();
Expand Down
Loading