adds expiration message for fcm provider

src/Utopia/Messaging/Adapter.php

@@ -35,7 +35,7 @@ abstract public function getMaxMessagesPerRequest(): int;
      *     deliveredTo: int,
      *     type: string,
      *     results: array<array<string, mixed>>
-     * }>
+     * }> GEOSMS adapter returns an array of results keyed by adapter name.
      *
      * @throws \Exception
      */

src/Utopia/Messaging/Adapter/Push.php

@@ -17,6 +17,11 @@ public function getMessageType(): string
         return PushMessage::class;
     }
 
+    protected static function getExpiredErrorMessage(): string
+    {
+        return 'Expired device token.';
+    }
+
     /**
      * Send a push message.
      *

src/Utopia/Messaging/Adapter/Push/APNS.php

@@ -103,26 +103,14 @@ public function process(PushMessage $message): array
                 default:
                     $response->addResultForRecipient(
                         $device,
-                        self::getSpecificErrorMessage($result['response']['reason'])
+                        $result['response']['reason'] === 'ExpiredToken' ||
+                        $result['response']['reason'] === 'BadDeviceToken' ?
+                        self::getExpiredErrorMessage() : $result['response']['reason'],
                     );
                     break;
             }
         }
 
         return $response->toArray();
     }
-
-    private static function getSpecificErrorMessage(string $error): string
-    {
-        return match ($error) {
-            'MissingDeviceToken' => 'Bad Request. Missing token.',
-            'BadDeviceToken' => 'Invalid device token.',
-            'ExpiredToken' => 'Expired device token.',
-            'PayloadTooLarge' => 'Payload is too large. Messages must be less than 4096 bytes.',
-            'TooManyRequests' => 'Too many requests were made to the same device token.',
-            'InternalServerError' => 'Internal server error.',
-            'PayloadEmpty' => 'Missing payload.',
-            default => $error,
-        };
-    }
 }

src/Utopia/Messaging/Adapter/Push/FCM.php

@@ -144,10 +144,20 @@ protected function process(PushMessage $message): array
             if ($result['statusCode'] === 200) {
                 $response->incrementDeliveredTo();
             }
-            $response->addResultForRecipient(
-                $message->getTo()[$index],
-                $result['response']['error']['message'] ?? ''
-            );
+
+            if (isset($result['response']['error'])) {
+                $response->addResultForRecipient(
+                    $message->getTo()[$index],
+                    $result['response']['error']['status'] === 'UNREGISTERED' ||
+                    $result['response']['error']['status'] === 'INVALID_ARGUMENT'
+                    ? self::getExpiredErrorMessage()
+                    : $result['response']['error']['message'] ?? ''
+                );
+
+                continue;
+            }
+
+            $response->addResultForRecipient($message->getTo()[$index]);
         }
 
         return $response->toArray();

src/Utopia/Messaging/Response.php

@@ -68,7 +68,7 @@ public function getDetails(): array
     }
 
     /**
-     * @return array<string, mixed>
+     * @return array{deliveredTo: int, type: string, results: array<array<string, mixed>>}
      */
     public function toArray(): array
     {