fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-22 05:15:29 +09:00
Code Issues Projects Releases Packages Wiki Activity

Improve detection of invalid FCM tokens

Browse source
This commit is contained in:
Kijin Sung 2024-11-10 14:46:42 +09:00
parent 70625171ca
commit cfa6d761aa
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
common/framework/drivers/push/fcmv1.php
View file

@ -151,7 +151,8 @@ class FCMv1 extends Base implements PushInterface
foreach ($responses as $i => $response) foreach ($responses as $i => $response)
{ {
$status_code = $response->getStatusCode(); $status_code = $response->getStatusCode();
$result = @json_decode($response->getBody()->getContents()); $result_text = $response->getBody()->getContents();
$result = @json_decode($result_text);
if ($status_code === 200) if ($status_code === 200)
{ {
$output->success[$tokens[$i]] = $result->name ?? ''; $output->success[$tokens[$i]] = $result->name ?? '';
@ -164,6 +165,10 @@ class FCMv1 extends Base implements PushInterface
{ {
$output->invalid[$tokens[$i]] = $tokens[$i]; $output->invalid[$tokens[$i]] = $tokens[$i];
} }
elseif (str_contains($error_message, 'Requested entity was not found'))
{
$output->invalid[$tokens[$i]] = $tokens[$i];
}
} }
else else
{ {
@ -196,7 +201,8 @@ class FCMv1 extends Base implements PushInterface
foreach ($responses as $i => $response) foreach ($responses as $i => $response)
{ {
$status_code = $response->getStatusCode(); $status_code = $response->getStatusCode();
$result = @json_decode($response->getBody()->getContents()); $result_text = $response->getBody()->getContents();
$result = @json_decode($result_text);
if ($status_code === 200) if ($status_code === 200)
{ {
$output->success[$topics[$i]] = $result->name ?? ''; $output->success[$topics[$i]] = $result->name ?? '';