bug #53824 [Mailer][Postmark][Webhook] Don't require tag and metadata (aleho)

nicolas-grekas · nicolas-grekas · commit 8f98550d7798 · 2024-02-08T15:43:07.000+01:00
This PR was merged into the 6.4 branch. Discussion ---------- [Mailer][Postmark][Webhook] Don't require tag and metadata | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | License | MIT Postmark webhooks will fail if metadata or tag are missing. As both are optional they should not be required in parsing as well. This was observed in our setup with all webhooks failing because `Tag` was missing. Commits ------- 7127ede [Mailer][Postmark][Webhook] Don't require tag and metadata
diff --git a/src/Symfony/Component/Mailer/Bridge/Postmark/RemoteEvent/PostmarkPayloadConverter.php b/src/Symfony/Component/Mailer/Bridge/Postmark/RemoteEvent/PostmarkPayloadConverter.php
@@ -52,8 +52,13 @@ public function convert(array $payload): AbstractMailerEvent
         }
         $event->setDate($date);
         $event->setRecipientEmail($payload['Recipient'] ?? $payload['Email']);
-        $event->setMetadata($payload['Metadata']);
-        $event->setTags([$payload['Tag']]);
+
+        if (isset($payload['Metadata'])) {
+            $event->setMetadata($payload['Metadata']);
+        }
+        if (isset($payload['Tag'])) {
+            $event->setTags([$payload['Tag']]);
+        }
 
         return $event;
     }
diff --git a/src/Symfony/Component/Mailer/Bridge/Postmark/Webhook/PostmarkRequestParser.php b/src/Symfony/Component/Mailer/Bridge/Postmark/Webhook/PostmarkRequestParser.php
@@ -48,8 +48,6 @@ protected function doParse(Request $request, #[\SensitiveParameter] string $secr
             !isset($payload['RecordType'])
             || !isset($payload['MessageID'])
             || !(isset($payload['Recipient']) || isset($payload['Email']))
-            || !isset($payload['Metadata'])
-            || !isset($payload['Tag'])
         ) {
             throw new RejectWebhookException(406, 'Payload is malformed.');
         }

Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,6 @@ protected function doParse(Request $request, #[\SensitiveParameter] string $secr`
`48`	`48`	`!isset($payload['RecordType'])`
`49`	`49`	`\|\| !isset($payload['MessageID'])`
`50`	`50`	`\|\| !(isset($payload['Recipient']) \|\| isset($payload['Email']))`
`51`		`- \|\| !isset($payload['Metadata'])`
`52`		`- \|\| !isset($payload['Tag'])`
`53`	`51`	`) {`
`54`	`52`	`throw new RejectWebhookException(406, 'Payload is malformed.');`
`55`	`53`	`}`