bug #52095 [Notifier][Sendinblue] Handle error responses without a message key (stof)

nicolas-grekas · nicolas-grekas · commit 754e48207356 · 2023-10-17T11:57:34.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [Notifier][Sendinblue] Handle error responses without a message key | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | | License | MIT During their outage yesterday where the endpoint returned errors with status code 500, there was no `message` key in the json response. This avoids a notice when the key does not exist. Instead, it uses the full response content, as done when the decoding fails. Commits ------- 8ae8993 Handle Sendinblue error responses without a message key
diff --git a/src/Symfony/Component/Mailer/Bridge/Sendinblue/Transport/SendinblueApiTransport.php b/src/Symfony/Component/Mailer/Bridge/Sendinblue/Transport/SendinblueApiTransport.php
@@ -65,7 +65,7 @@ protected function doSendApi(SentMessage $sentMessage, Email $email, Envelope $e
         }
 
         if (201 !== $statusCode) {
-            throw new HttpTransportException('Unable to send an email: '.$result['message'].sprintf(' (code %d).', $statusCode), $response);
+            throw new HttpTransportException('Unable to send an email: '.($result['message'] ?? $response->getContent(false)).sprintf(' (code %d).', $statusCode), $response);
         }
 
         $sentMessage->setMessageId($result['messageId']);
diff --git a/src/Symfony/Component/Notifier/Bridge/Sendinblue/SendinblueTransport.php b/src/Symfony/Component/Notifier/Bridge/Sendinblue/SendinblueTransport.php
@@ -75,7 +75,7 @@ protected function doSend(MessageInterface $message): SentMessage
         if (201 !== $statusCode) {
             $error = $response->toArray(false);
 
-            throw new TransportException('Unable to send the SMS: '.$error['message'], $response);
+            throw new TransportException('Unable to send the SMS: '.($error['message'] ?? $response->getContent(false)), $response);
         }
 
         $success = $response->toArray(false);

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ protected function doSendApi(SentMessage $sentMessage, Email $email, Envelope $e`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`if (201 !== $statusCode) {`
`68`		`- throw new HttpTransportException('Unable to send an email: '.$result['message'].sprintf(' (code %d).', $statusCode), $response);`
	`68`	`+ throw new HttpTransportException('Unable to send an email: '.($result['message'] ?? $response->getContent(false)).sprintf(' (code %d).', $statusCode), $response);`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`$sentMessage->setMessageId($result['messageId']);`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ protected function doSend(MessageInterface $message): SentMessage`
`75`	`75`	`if (201 !== $statusCode) {`
`76`	`76`	`$error = $response->toArray(false);`
`77`	`77`
`78`		`- throw new TransportException('Unable to send the SMS: '.$error['message'], $response);`
	`78`	`+ throw new TransportException('Unable to send the SMS: '.($error['message'] ?? $response->getContent(false)), $response);`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`$success = $response->toArray(false);`