bug #47626 [Notifier] [Expo] Throw exception on error-response from expo api (sdrewergutland)

fabpot · fabpot · commit ef3df52601bc · 2022-09-30T10:22:52.000+02:00
This PR was squashed before being merged into the 5.4 branch. Discussion ---------- [Notifier] [Expo] Throw exception on error-response from expo api | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Throw an actual `TransportException`in the case that an error is returned in the response from expo api. Commits ------- 90638ac [Notifier] [Expo] Throw exception on error-response from expo api
diff --git a/src/Symfony/Component/Notifier/Bridge/Expo/ExpoTransport.php b/src/Symfony/Component/Notifier/Bridge/Expo/ExpoTransport.php
@@ -50,6 +50,9 @@ public function supports(MessageInterface $message): bool
         return $message instanceof PushMessage;
     }
 
+    /**
+     * @see https://docs.expo.dev/push-notifications/sending-notifications/#http2-api
+     */
     protected function doSend(MessageInterface $message): SentMessage
     {
         if (!$message instanceof PushMessage) {
@@ -91,10 +94,14 @@ protected function doSend(MessageInterface $message): SentMessage
             throw new TransportException('Unable to post the Expo message: '.$errorMessage, $response);
         }
 
-        $success = $response->toArray(false);
+        $result = $response->toArray(false);
+
+        if ('error' === $result['data']['status']) {
+            throw new TransportException(sprintf('Unable to post the Expo message: "%s" (%s)', $result['data']['message'], $result['data']['details']['error']), $response);
+        }
 
         $sentMessage = new SentMessage($message, (string) $this);
-        $sentMessage->setMessageId($success['data']['id']);
+        $sentMessage->setMessageId($result['data']['id']);
 
         return $sentMessage;
     }

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,9 @@ public function supports(MessageInterface $message): bool`
`50`	`50`	`return $message instanceof PushMessage;`
`51`	`51`	`}`
`52`	`52`
	`53`	`+ /**`
	`54`	`+ * @see https://docs.expo.dev/push-notifications/sending-notifications/#http2-api`
	`55`	`+ */`
`53`	`56`	`protected function doSend(MessageInterface $message): SentMessage`
`54`	`57`	`{`
`55`	`58`	`if (!$message instanceof PushMessage) {`
`@@ -91,10 +94,14 @@ protected function doSend(MessageInterface $message): SentMessage`
`91`	`94`	`throw new TransportException('Unable to post the Expo message: '.$errorMessage, $response);`
`92`	`95`	`}`
`93`	`96`
`94`		`- $success = $response->toArray(false);`
	`97`	`+ $result = $response->toArray(false);`
	`98`	`+`
	`99`	`+ if ('error' === $result['data']['status']) {`
	`100`	`+ throw new TransportException(sprintf('Unable to post the Expo message: "%s" (%s)', $result['data']['message'], $result['data']['details']['error']), $response);`
	`101`	`+ }`
`95`	`102`
`96`	`103`	`$sentMessage = new SentMessage($message, (string) $this);`
`97`		`- $sentMessage->setMessageId($success['data']['id']);`
	`104`	`+ $sentMessage->setMessageId($result['data']['id']);`
`98`	`105`
`99`	`106`	`return $sentMessage;`
`100`	`107`	`}`