feat: only handle unsubscribe events for configured list ids
This commit is contained in:
@@ -245,6 +245,10 @@ services:
|
||||
arguments:
|
||||
$mailjetLists: '%mailjet_lists%'
|
||||
|
||||
App\Controller\Webhook\MailjetNewsletterWebhookController:
|
||||
arguments:
|
||||
$mailjetLists: '%mailjet_lists%'
|
||||
|
||||
App\Service\DomainConfigProvider:
|
||||
arguments:
|
||||
$domainConfig: '%domain_config%'
|
||||
|
||||
@@ -15,9 +15,13 @@ use Symfony\Component\Routing\Attribute\Route;
|
||||
|
||||
final class MailjetNewsletterWebhookController extends AbstractController
|
||||
{
|
||||
/**
|
||||
* @param array<int, string> $mailjetLists
|
||||
*/
|
||||
public function __construct(
|
||||
private readonly MessageBusInterface $messageBus,
|
||||
private readonly LoggerInterface $logger,
|
||||
private readonly array $mailjetLists = [],
|
||||
) {
|
||||
}
|
||||
|
||||
@@ -98,6 +102,15 @@ final class MailjetNewsletterWebhookController extends AbstractController
|
||||
return null;
|
||||
}
|
||||
|
||||
if (false === $this->isHandledListId($mailjetListId)) {
|
||||
$this->logger->info('Ignored Mailjet newsletter webhook event for unconfigured list', [
|
||||
'email' => $email,
|
||||
'mailjet_list_id' => $mailjetListId,
|
||||
]);
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
return new MailjetNewsletterEventMessage(
|
||||
email: $email,
|
||||
mailjetListId: $mailjetListId,
|
||||
@@ -126,6 +139,11 @@ final class MailjetNewsletterWebhookController extends AbstractController
|
||||
return null;
|
||||
}
|
||||
|
||||
private function isHandledListId(int $mailjetListId): bool
|
||||
{
|
||||
return array_key_exists($mailjetListId, $this->mailjetLists);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array<string, mixed> $payload
|
||||
*/
|
||||
|
||||
@@ -28,7 +28,7 @@ class MailjetNewsletterWebhookControllerTest extends TestCase
|
||||
}))
|
||||
->willReturnCallback(static fn (object $message): Envelope => new Envelope($message));
|
||||
|
||||
$controller = new MailjetNewsletterWebhookController($messageBus, new NullLogger());
|
||||
$controller = new MailjetNewsletterWebhookController($messageBus, new NullLogger(), [123 => 'Newsletter']);
|
||||
$response = $controller->index(Request::create(
|
||||
'/webhooks/mailjet/newsletter',
|
||||
'POST',
|
||||
@@ -55,12 +55,69 @@ class MailjetNewsletterWebhookControllerTest extends TestCase
|
||||
self::assertSame(1770000000, $dispatchedMessages[0]->eventAt?->getTimestamp());
|
||||
}
|
||||
|
||||
public function testIgnoresEventsForUnconfiguredLists(): void
|
||||
{
|
||||
$messageBus = $this->createMock(MessageBusInterface::class);
|
||||
$messageBus->expects(self::never())->method('dispatch');
|
||||
|
||||
$controller = new MailjetNewsletterWebhookController($messageBus, new NullLogger(), [999 => 'Newsletter']);
|
||||
$response = $controller->index(Request::create(
|
||||
'/webhooks/mailjet/newsletter',
|
||||
'POST',
|
||||
content: json_encode([
|
||||
'event' => MailjetNewsletterEventMessage::EVENT_UNSUBSCRIBE,
|
||||
'email' => '[email protected]',
|
||||
'mj_list_id' => '123',
|
||||
], JSON_THROW_ON_ERROR),
|
||||
));
|
||||
|
||||
self::assertSame(200, $response->getStatusCode());
|
||||
self::assertSame(['success' => true, 'dispatched' => 0], json_decode($response->getContent() ?: '', true, 512, JSON_THROW_ON_ERROR));
|
||||
}
|
||||
|
||||
public function testDispatchesOnlyConfiguredEventsFromBatchPayload(): void
|
||||
{
|
||||
$dispatchedMessages = [];
|
||||
$messageBus = $this->createMock(MessageBusInterface::class);
|
||||
$messageBus
|
||||
->expects(self::once())
|
||||
->method('dispatch')
|
||||
->with(self::callback(static function (MailjetNewsletterEventMessage $message) use (&$dispatchedMessages): bool {
|
||||
$dispatchedMessages[] = $message;
|
||||
|
||||
return true;
|
||||
}))
|
||||
->willReturnCallback(static fn (object $message): Envelope => new Envelope($message));
|
||||
|
||||
$controller = new MailjetNewsletterWebhookController($messageBus, new NullLogger(), [123 => 'Newsletter']);
|
||||
$response = $controller->index(Request::create(
|
||||
'/webhooks/mailjet/newsletter',
|
||||
'POST',
|
||||
content: json_encode([
|
||||
[
|
||||
'event' => MailjetNewsletterEventMessage::EVENT_UNSUBSCRIBE,
|
||||
'email' => '[email protected]',
|
||||
'mj_list_id' => '123',
|
||||
],
|
||||
[
|
||||
'event' => MailjetNewsletterEventMessage::EVENT_UNSUBSCRIBE,
|
||||
'email' => '[email protected]',
|
||||
'mj_list_id' => '999',
|
||||
],
|
||||
], JSON_THROW_ON_ERROR),
|
||||
));
|
||||
|
||||
self::assertSame(200, $response->getStatusCode());
|
||||
self::assertCount(1, $dispatchedMessages);
|
||||
self::assertSame(123, $dispatchedMessages[0]->mailjetListId);
|
||||
}
|
||||
|
||||
public function testRejectsInvalidJson(): void
|
||||
{
|
||||
$messageBus = $this->createMock(MessageBusInterface::class);
|
||||
$messageBus->expects(self::never())->method('dispatch');
|
||||
|
||||
$controller = new MailjetNewsletterWebhookController($messageBus, new NullLogger());
|
||||
$controller = new MailjetNewsletterWebhookController($messageBus, new NullLogger(), [123 => 'Newsletter']);
|
||||
$response = $controller->index(Request::create('/webhooks/mailjet/newsletter', 'POST', content: '{'));
|
||||
|
||||
self::assertSame(400, $response->getStatusCode());
|
||||
@@ -71,7 +128,7 @@ class MailjetNewsletterWebhookControllerTest extends TestCase
|
||||
$messageBus = $this->createMock(MessageBusInterface::class);
|
||||
$messageBus->expects(self::never())->method('dispatch');
|
||||
|
||||
$controller = new MailjetNewsletterWebhookController($messageBus, new NullLogger());
|
||||
$controller = new MailjetNewsletterWebhookController($messageBus, new NullLogger(), [123 => 'Newsletter']);
|
||||
$response = $controller->index(Request::create(
|
||||
'/webhooks/mailjet/newsletter',
|
||||
'POST',
|
||||
|
||||
Reference in New Issue
Block a user