Skip to content

[Notifier] Fix 'Undefined array key' error in FirebaseTransport #43408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 12, 2021
Merged

[Notifier] Fix 'Undefined array key' error in FirebaseTransport #43408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/Symfony/Component/Notifier/Bridge/Firebase/FirebaseTransport.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,17 @@ protected function doSend(MessageInterface $message): SentMessage

$contentType = $response->getHeaders(false)['content-type'][0] ?? '';
$jsonContents = 0 === strpos($contentType, 'application/json') ? $response->toArray(false) : null;
$errorMessage = null;

if (200 !== $statusCode) {
$errorMessage = $jsonContents ? $jsonContents['results']['error'] : $response->getContent(false);
if ($jsonContents && isset($jsonContents['results'][0]['error'])) {
$errorMessage = $jsonContents['results'][0]['error'];
} elseif (200 !== $statusCode) {
$errorMessage = $response->getContent(false);
}

if (null !== $errorMessage) {
throw new TransportException('Unable to post the Firebase message: '.$errorMessage, $response);
}
if ($jsonContents && isset($jsonContents['results'][0]['error'])) {
throw new TransportException('Unable to post the Firebase message: '.$jsonContents['results'][0]['error'], $response);
}

$success = $response->toArray(false);

Expand Down
35 changes: 35 additions & 0 deletions src/Symfony/Component/Notifier/Bridge/Firebase/Tests/FirebaseTransportTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,18 @@

namespace Symfony\Component\Notifier\Bridge\Firebase\Tests;

use Symfony\Component\HttpClient\MockHttpClient;
use Symfony\Component\HttpClient\Response\MockResponse;
use Symfony\Component\Notifier\Bridge\Firebase\FirebaseOptions;
use Symfony\Component\Notifier\Bridge\Firebase\FirebaseTransport;
use Symfony\Component\Notifier\Exception\TransportException;
use Symfony\Component\Notifier\Message\ChatMessage;
use Symfony\Component\Notifier\Message\MessageInterface;
use Symfony\Component\Notifier\Message\SmsMessage;
use Symfony\Component\Notifier\Test\TransportTestCase;
use Symfony\Component\Notifier\Transport\TransportInterface;
use Symfony\Contracts\HttpClient\HttpClientInterface;
use Symfony\Contracts\HttpClient\ResponseInterface;

/**
* @author Oskar Stark <oskarstark@googlemail.com>
Expand Down Expand Up @@ -47,4 +52,34 @@ public function unsupportedMessagesProvider(): iterable
yield [new SmsMessage('0611223344', 'Hello!')];
yield [$this->createMock(MessageInterface::class)];
}

/**
* @dataProvider sendWithErrorThrowsExceptionProvider
*/
public function testSendWithErrorThrowsTransportException(ResponseInterface $response)
{
$this->expectException(TransportException::class);

$client = new MockHttpClient(static function () use ($response): ResponseInterface {
return $response;
});
$options = new class('recipient-id', []) extends FirebaseOptions {};

$transport = $this->createTransport($client);

$transport->send(new ChatMessage('Hello!', $options));
}

public function sendWithErrorThrowsExceptionProvider(): iterable
{
yield [new MockResponse(
json_encode(['results' => [['error' => 'testErrorCode']]]),
['response_headers' => ['content-type' => ['application/json']], 'http_code' => 200]
)];

yield [new MockResponse(
json_encode(['results' => [['error' => 'testErrorCode']]]),
['response_headers' => ['content-type' => ['application/json']], 'http_code' => 400]
)];
}
}