From 481c007616807a109023017fd3627efb465e2e57 Mon Sep 17 00:00:00 2001 From: sebastian Date: Sun, 11 Feb 2024 22:19:53 +0100 Subject: [PATCH] [Mailer] [Amazon] Add support for X-SES-LIST-MANAGEMENT-OPTIONS header --- .../Mailer/Bridge/Amazon/CHANGELOG.md | 5 ++++ .../Transport/SesApiAsyncAwsTransportTest.php | 2 ++ .../SesHttpAsyncAwsTransportTest.php | 2 ++ .../Transport/SesApiAsyncAwsTransport.php | 5 ++++ .../Transport/SesHttpAsyncAwsTransport.php | 24 +++++++++++-------- .../Mailer/Bridge/Amazon/composer.json | 2 +- 6 files changed, 29 insertions(+), 11 deletions(-) diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/CHANGELOG.md b/src/Symfony/Component/Mailer/Bridge/Amazon/CHANGELOG.md index ce9d5938434e5..ef61ac9a14c0a 100644 --- a/src/Symfony/Component/Mailer/Bridge/Amazon/CHANGELOG.md +++ b/src/Symfony/Component/Mailer/Bridge/Amazon/CHANGELOG.md @@ -1,6 +1,11 @@ CHANGELOG ========= +7.1 +--- + +* Add support for `X-SES-LIST-MANAGEMENT-OPTIONS` + 6.1 --- diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesApiAsyncAwsTransportTest.php b/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesApiAsyncAwsTransportTest.php index 42fbf74748421..0bf19423c31d1 100644 --- a/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesApiAsyncAwsTransportTest.php +++ b/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesApiAsyncAwsTransportTest.php @@ -91,6 +91,7 @@ public function testSend() $this->assertSame('aws-source-arn', $content['FromEmailAddressIdentityArn']); $this->assertSame('bounces@example.com', $content['FeedbackForwardingEmailAddress']); $this->assertSame([['Name' => 'tagName1', 'Value' => 'tag Value1'], ['Name' => 'tagName2', 'Value' => 'tag Value2']], $content['EmailTags']); + $this->assertSame(['ContactListName' => 'TestContactList', 'TopicName' => 'TestNewsletter'], $content['ListManagementOptions']); $json = '{"MessageId": "foobar"}'; @@ -113,6 +114,7 @@ public function testSend() $mail->getHeaders()->addTextHeader('X-SES-CONFIGURATION-SET', 'aws-configuration-set-name'); $mail->getHeaders()->addTextHeader('X-SES-SOURCE-ARN', 'aws-source-arn'); + $mail->getHeaders()->addTextHeader('X-SES-LIST-MANAGEMENT-OPTIONS', 'contactListName=TestContactList;topicName=TestNewsletter'); $mail->getHeaders()->add(new MetadataHeader('tagName1', 'tag Value1')); $mail->getHeaders()->add(new MetadataHeader('tagName2', 'tag Value2')); diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesHttpAsyncAwsTransportTest.php b/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesHttpAsyncAwsTransportTest.php index e4cd8ca9e805a..0a3bbbe421b7e 100644 --- a/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesHttpAsyncAwsTransportTest.php +++ b/src/Symfony/Component/Mailer/Bridge/Amazon/Tests/Transport/SesHttpAsyncAwsTransportTest.php @@ -88,6 +88,7 @@ public function testSend() $this->assertSame('aws-configuration-set-name', $body['ConfigurationSetName']); $this->assertSame('aws-source-arn', $body['FromEmailAddressIdentityArn']); $this->assertSame([['Name' => 'tagName1', 'Value' => 'tag Value1'], ['Name' => 'tagName2', 'Value' => 'tag Value2']], $body['EmailTags']); + $this->assertSame(['ContactListName' => 'TestContactList', 'TopicName' => 'TestNewsletter'], $body['ListManagementOptions']); $json = '{"MessageId": "foobar"}'; @@ -106,6 +107,7 @@ public function testSend() $mail->getHeaders()->addTextHeader('X-SES-CONFIGURATION-SET', 'aws-configuration-set-name'); $mail->getHeaders()->addTextHeader('X-SES-SOURCE-ARN', 'aws-source-arn'); + $mail->getHeaders()->addTextHeader('X-SES-LIST-MANAGEMENT-OPTIONS', 'contactListName=TestContactList;topicName=TestNewsletter'); $mail->getHeaders()->add(new MetadataHeader('tagName1', 'tag Value1')); $mail->getHeaders()->add(new MetadataHeader('tagName2', 'tag Value2')); diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesApiAsyncAwsTransport.php b/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesApiAsyncAwsTransport.php index 5ce2cad3dd75d..8975da9024469 100644 --- a/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesApiAsyncAwsTransport.php +++ b/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesApiAsyncAwsTransport.php @@ -98,6 +98,11 @@ protected function getRequest(SentMessage $message): SendEmailRequest if ($header = $email->getHeaders()->get('X-SES-SOURCE-ARN')) { $request['FromEmailAddressIdentityArn'] = $header->getBodyAsString(); } + if ($header = $email->getHeaders()->get('X-SES-LIST-MANAGEMENT-OPTIONS')) { + if (preg_match("/^(contactListName=)*(?[^;]+)(;\s?topicName=(?.+))?$/ix", $header->getBodyAsString(), $listManagementOptions)) { + $request['ListManagementOptions'] = array_filter($listManagementOptions, fn ($e) => \in_array($e, ['ContactListName', 'TopicName']), \ARRAY_FILTER_USE_KEY); + } + } if ($email->getReturnPath()) { $request['FeedbackForwardingEmailAddress'] = $email->getReturnPath()->toString(); } diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesHttpAsyncAwsTransport.php b/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesHttpAsyncAwsTransport.php index 908c32c6b4bc7..cf70dc23c04ac 100644 --- a/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesHttpAsyncAwsTransport.php +++ b/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesHttpAsyncAwsTransport.php @@ -78,16 +78,20 @@ protected function getRequest(SentMessage $message): SendEmailRequest ], ]; - if (($message->getOriginalMessage() instanceof Message) - && $configurationSetHeader = $message->getOriginalMessage()->getHeaders()->get('X-SES-CONFIGURATION-SET')) { - $request['ConfigurationSetName'] = $configurationSetHeader->getBodyAsString(); - } - if (($message->getOriginalMessage() instanceof Message) - && $sourceArnHeader = $message->getOriginalMessage()->getHeaders()->get('X-SES-SOURCE-ARN')) { - $request['FromEmailAddressIdentityArn'] = $sourceArnHeader->getBodyAsString(); - } - if ($message->getOriginalMessage() instanceof Message) { - foreach ($message->getOriginalMessage()->getHeaders()->all() as $header) { + $originalMessage = $message->getOriginalMessage(); + if ($originalMessage instanceof Message) { + if ($configurationSetHeader = $message->getOriginalMessage()->getHeaders()->get('X-SES-CONFIGURATION-SET')) { + $request['ConfigurationSetName'] = $configurationSetHeader->getBodyAsString(); + } + if ($sourceArnHeader = $message->getOriginalMessage()->getHeaders()->get('X-SES-SOURCE-ARN')) { + $request['FromEmailAddressIdentityArn'] = $sourceArnHeader->getBodyAsString(); + } + if ($header = $message->getOriginalMessage()->getHeaders()->get('X-SES-LIST-MANAGEMENT-OPTIONS')) { + if (preg_match("/^(contactListName=)*(?[^;]+)(;\s?topicName=(?.+))?$/ix", $header->getBodyAsString(), $listManagementOptions)) { + $request['ListManagementOptions'] = array_filter($listManagementOptions, fn ($e) => \in_array($e, ['ContactListName', 'TopicName']), \ARRAY_FILTER_USE_KEY); + } + } + foreach ($originalMessage->getHeaders()->all() as $header) { if ($header instanceof MetadataHeader) { $request['EmailTags'][] = ['Name' => $header->getKey(), 'Value' => $header->getValue()]; } diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/composer.json b/src/Symfony/Component/Mailer/Bridge/Amazon/composer.json index e1847624fbbf1..9002e0e0355d9 100644 --- a/src/Symfony/Component/Mailer/Bridge/Amazon/composer.json +++ b/src/Symfony/Component/Mailer/Bridge/Amazon/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": ">=8.2", - "async-aws/ses": "^1.0", + "async-aws/ses": "^1.3", "symfony/mailer": "^6.4|^7.0" }, "require-dev": { pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy