Update guzzlehttp 7

.whitesource

@@ -0,0 +1,3 @@
+{
+  "settingsInheritedFrom": "vanderbilt-redcap/whitesource-config@main"
+}

composer.json

@@ -1,17 +1,17 @@
 {
-    "name": "sngrl/php-firebase-cloud-messaging",
+    "name": "vanderbilt-redcap/php-firebase-cloud-messaging",
     "description": "PHP API for Firebase Cloud Messaging from Google",
     "license": "MIT",
     "keywords": ["PHP","FCM","Google","Firebase","Cloud","Notifications","Android","iOS","Chrome"],
-    "homepage": "https://github.com/sngrl/php-firebase-cloud-messaging",
+    "homepage": "https://github.com/vanderbilt-redcap/php-firebase-cloud-messaging",
     "authors": [
         {
-            "name": "Sngrl",
-            "email": "i@sngrl.ru"
+            "name": "Vaishali Jagtap",
+            "email": "vaishali.jagtap@vumc.org"
         }
     ],
     "require": {
-        "guzzlehttp/guzzle": "*",
+        "guzzlehttp/guzzle": "^7.8",
         "php": ">=5.5"
     },
     "require-dev": {
@@ -20,12 +20,12 @@
     },
     "autoload": {
         "psr-4": {
-            "sngrl\\PhpFirebaseCloudMessaging\\": "src/"
+            "Vanderbilt\\PhpFirebaseCloudMessaging\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "sngrl\\PhpFirebaseCloudMessaging\\Tests\\": "tests/"
+            "Vanderbilt\\PhpFirebaseCloudMessaging\\Tests\\": "tests/"
         }
     }
 }

src/Client.php

@@ -1,18 +1,22 @@
 <?php
-namespace sngrl\PhpFirebaseCloudMessaging;
+namespace Vanderbilt\PhpFirebaseCloudMessaging;
 
 use GuzzleHttp;
 
 /**
- * @author sngrl
+ * @author Vanderbilt
  */
 class Client implements ClientInterface
 {
     const DEFAULT_API_URL = 'https://fcm.googleapis.com/fcm/send';
+    const HTTPV1_API_URL_PREFIX = 'https://fcm.googleapis.com/v1/projects/';
+    const HTTPV1_API_URL_POSTEFIX = '/messages:send';
     const DEFAULT_TOPIC_ADD_SUBSCRIPTION_API_URL = 'https://iid.googleapis.com/iid/v1:batchAdd';
     const DEFAULT_TOPIC_REMOVE_SUBSCRIPTION_API_URL = 'https://iid.googleapis.com/iid/v1:batchRemove';
 
     private $apiKey;
+    private $accessToken;
+    private $projectId;
     private $proxyApiUrl;
     private $guzzleClient;
 
@@ -27,7 +31,7 @@ public function injectGuzzleHttpClient(GuzzleHttp\ClientInterface $client)
      *
      * @param string $apiKey
      *
-     * @return \sngrl\PhpFirebaseCloudMessaging\Client
+     * @return \Vanderbilt\PhpFirebaseCloudMessaging\Client
      */
     public function setApiKey($apiKey)
     {
@@ -40,14 +44,26 @@ public function setApiKey($apiKey)
      *
      * @param string $url
      *
-     * @return \sngrl\PhpFirebaseCloudMessaging\Client
+     * @return \Vanderbilt\PhpFirebaseCloudMessaging\Client
      */
     public function setProxyApiUrl($url)
     {
         $this->proxyApiUrl = $url;
         return $this;
     }
 
+    /**
+     * add your server access token here
+     *
+     * @param string $accessToken
+     *
+     * @return \Vanderbilt\PhpFirebaseCloudMessaging\Client
+     */
+    public function setAccessToken($accessToken)
+    {
+        $this->accessToken = $accessToken;
+        return $this;
+    }
     /**
      * sends your notification to the google servers and returns a guzzle repsonse object
      * containing their answer.
@@ -59,16 +75,41 @@ public function setProxyApiUrl($url)
      */
     public function send(Message $message)
     {
-        return $this->guzzleClient->post(
-            $this->getApiUrl(),
-            [
-                'headers' => [
-                    'Authorization' => sprintf('key=%s', $this->apiKey),
-                    'Content-Type' => 'application/json'
-                ],
-                'body' => json_encode($message)
-            ]
-        );
+        $param = ['message' => $message];
+
+        // FCM HTTP V1 does not support sending notifications to multiple devices (supported only in legacy API via registration_tokens
+        // So, sending notification to devices in a loop (It will be rare case where same participant joined from different devices)
+        $recipients = $message->getRecipients();
+        if (count($recipients) > 1) {
+            foreach ($recipients as $recipient) {
+                $token = $recipient->getToken();
+                $messageArr = json_decode(json_encode($param), true);
+                unset($messageArr['message']['registration_ids']);
+                $messageArr['message']['token'] = $token;
+                $output = $this->guzzleClient->post(
+                    $this->getHTTPV1ApiUrl(),
+                    [
+                        'headers' => [
+                            'Authorization' => sprintf('Bearer %s', $this->accessToken),
+                            'Content-Type' => 'application/json'
+                        ],
+                        'body' => json_encode($messageArr)
+                    ]
+                );
+            }
+            return $output;
+        } else {
+            return $this->guzzleClient->post(
+                $this->getHTTPV1ApiUrl(),
+                [
+                    'headers' => [
+                        'Authorization' => sprintf('Bearer %s', $this->accessToken),
+                        'Content-Type' => 'application/json'
+                    ],
+                    'body' => json_encode($param)
+                ]
+            );
+        }
     }
 
     /**
@@ -111,7 +152,8 @@ protected function processTopicSubscription($topic_id, $recipients_tokens, $url)
             $url,
             [
                 'headers' => [
-                    'Authorization' => sprintf('key=%s', $this->apiKey),
+                    'Authorization' => sprintf('Bearer %s', $this->accessToken),
+                    'access_token_auth' => true,
                     'Content-Type' => 'application/json'
                 ],
                 'body' => json_encode([
@@ -127,4 +169,25 @@ private function getApiUrl()
     {
         return isset($this->proxyApiUrl) ? $this->proxyApiUrl : self::DEFAULT_API_URL;
     }
+
+    /**
+     * add your project ID
+     *
+     * @param string $projectId
+     *
+     * @return \Vanderbilt\PhpFirebaseCloudMessaging\Client
+     */
+    public function setProjectId($projectId)
+    {
+        $this->projectId = $projectId;
+    }
+    private function getHTTPV1ApiUrl()
+    {
+        return self::HTTPV1_API_URL_PREFIX.$this->getProjectId().self::HTTPV1_API_URL_POSTEFIX;
+    }
+
+    public function getProjectId()
+    {
+        return $this->projectId;
+    }
 }

src/ClientInterface.php

@@ -1,11 +1,11 @@
 <?php
-namespace sngrl\PhpFirebaseCloudMessaging;
+namespace Vanderbilt\PhpFirebaseCloudMessaging;
 
 use GuzzleHttp;
 
 /**
  *
- * @author sngrl
+ * @author Vanderbilt
  *
  */
 interface ClientInterface
@@ -17,7 +17,7 @@ interface ClientInterface
      *
      * @param string $apiKey
      *
-     * @return \sngrl\PhpFirebaseCloudMessaging\Client
+     * @return \Vanderbilt\PhpFirebaseCloudMessaging\Client
      */
     function setApiKey($apiKey);
 
@@ -27,7 +27,7 @@ function setApiKey($apiKey);
      *
      * @param string $url
      *
-     * @return \sngrl\PhpFirebaseCloudMessaging\Client
+     * @return \Vanderbilt\PhpFirebaseCloudMessaging\Client
      */
     function setProxyApiUrl($url);
 

src/Message.php

@@ -1,12 +1,12 @@
 <?php
-namespace sngrl\PhpFirebaseCloudMessaging;
+namespace Vanderbilt\PhpFirebaseCloudMessaging;
 
-use sngrl\PhpFirebaseCloudMessaging\Recipient\Recipient;
-use sngrl\PhpFirebaseCloudMessaging\Recipient\Topic;
-use sngrl\PhpFirebaseCloudMessaging\Recipient\Device;
+use Vanderbilt\PhpFirebaseCloudMessaging\Recipient\Recipient;
+use Vanderbilt\PhpFirebaseCloudMessaging\Recipient\Topic;
+use Vanderbilt\PhpFirebaseCloudMessaging\Recipient\Device;
 
 /**
- * @author sngrl
+ * @author Vanderbilt
  */
 class Message implements \JsonSerializable
 {
@@ -15,10 +15,11 @@ class Message implements \JsonSerializable
      */
     const MAX_TOPICS = 3;
     const MAX_DEVICES = 1000;
-    
+
     private $notification;
     private $collapseKey;    
     private $priority;
+    private $android;
     private $data;
     private $recipients = [];
     private $recipientType;    
@@ -35,7 +36,7 @@ public function __construct() {
      *
      * @param Recipient $recipient
      *
-     * @return \sngrl\PhpFirebaseCloudMessaging\Message
+     * @return \Vanderbilt\PhpFirebaseCloudMessaging\Message
      */
     public function addRecipient(Recipient $recipient)
     {
@@ -68,7 +69,11 @@ public function setPriority($priority)
         $this->priority = $priority;
         return $this;
     }
-
+    public function setAndroidPriority(array $priority)
+    {
+        $this->android = $priority;
+        return $this;
+    }
     public function setData(array $data)
     {
         $this->data = $data;
@@ -166,7 +171,11 @@ public function jsonSerialize()
         }
 
         if (count($this->recipients) == 1) {
-            $jsonData['to'] = $this->createTarget();    
+            if ($this->recipientType == Device::class) {
+                $jsonData['token'] = $this->createTarget();
+            } else {
+                $jsonData['topic'] = $this->createTarget();
+            }
         } elseif ($this->recipientType == Device::class) {
             $jsonData['registration_ids'] = $this->createTarget();
         } else {
@@ -185,6 +194,9 @@ public function jsonSerialize()
         if ($this->notification) {
             $jsonData['notification'] = $this->notification;
         }
+        if ($this->android) {
+            $jsonData['android'] = $this->android;
+        }
 
         return $jsonData;
     }
@@ -198,7 +210,7 @@ private function createTarget()
             case Topic::class:
 
                 if ($recipientCount == 1) {
-                    return sprintf('/topics/%s', current($this->recipients)->getName());    
+                    return sprintf('%s', current($this->recipients)->getName());
 
                 } else if ($recipientCount > self::MAX_TOPICS) {
                     throw new \OutOfRangeException(sprintf('Message topic limit exceeded. Firebase supports a maximum of %u topics.', self::MAX_TOPICS));
@@ -240,4 +252,9 @@ private function createTarget()
         }
         return null;
     }
+
+    /* Get All recipients */
+    public function getRecipients() {
+        return $this->recipients;
+    }
 }

src/Notification.php

@@ -1,5 +1,5 @@
 <?php
-namespace sngrl\PhpFirebaseCloudMessaging;
+namespace Vanderbilt\PhpFirebaseCloudMessaging;
 
 /**
  * @link https://firebase.google.com/docs/cloud-messaging/http-server-ref#notification-payload-support

src/Recipient/Device.php

@@ -1,5 +1,5 @@
 <?php
-namespace sngrl\PhpFirebaseCloudMessaging\Recipient;
+namespace Vanderbilt\PhpFirebaseCloudMessaging\Recipient;
 
 class Device extends Recipient
 {

src/Recipient/Recipient.php

@@ -1,5 +1,5 @@
 <?php
-namespace sngrl\PhpFirebaseCloudMessaging\Recipient;
+namespace Vanderbilt\PhpFirebaseCloudMessaging\Recipient;
 
 class Recipient
 {

src/Recipient/Topic.php

@@ -1,5 +1,5 @@
 <?php
-namespace sngrl\PhpFirebaseCloudMessaging\Recipient;
+namespace Vanderbilt\PhpFirebaseCloudMessaging\Recipient;
 
 class Topic extends Recipient
 {

tests/ClientTest.php

@@ -1,9 +1,9 @@
 <?php
-namespace sngrl\PhpFirebaseCloudMessaging\Tests;
+namespace Vanderbilt\PhpFirebaseCloudMessaging\Tests;
 
-use sngrl\PhpFirebaseCloudMessaging\Client;
-use sngrl\PhpFirebaseCloudMessaging\Recipient\Topic;
-use sngrl\PhpFirebaseCloudMessaging\Message;
+use Vanderbilt\PhpFirebaseCloudMessaging\Client;
+use Vanderbilt\PhpFirebaseCloudMessaging\Recipient\Topic;
+use Vanderbilt\PhpFirebaseCloudMessaging\Message;
 
 use GuzzleHttp;
 use GuzzleHttp\Psr7\Response;

tests/MessageTest.php

@@ -1,11 +1,11 @@
 <?php
-namespace sngrl\PhpFirebaseCloudMessaging\Tests;
+namespace Vanderbilt\PhpFirebaseCloudMessaging\Tests;
 
-use sngrl\PhpFirebaseCloudMessaging\Recipient\Recipient;
-use sngrl\PhpFirebaseCloudMessaging\Message;
-use sngrl\PhpFirebaseCloudMessaging\Recipient\Topic;
-use sngrl\PhpFirebaseCloudMessaging\Notification;
-use sngrl\PhpFirebaseCloudMessaging\Recipient\Device;
+use Vanderbilt\PhpFirebaseCloudMessaging\Recipient\Recipient;
+use Vanderbilt\PhpFirebaseCloudMessaging\Message;
+use Vanderbilt\PhpFirebaseCloudMessaging\Recipient\Topic;
+use Vanderbilt\PhpFirebaseCloudMessaging\Notification;
+use Vanderbilt\PhpFirebaseCloudMessaging\Recipient\Device;
 
 class MessageTest extends PhpFirebaseCloudMessagingTestCase
 {

tests/NotificationTest.php

@@ -1,7 +1,7 @@
 <?php
-namespace sngrl\PhpFirebaseCloudMessaging\Tests;
+namespace Vanderbilt\PhpFirebaseCloudMessaging\Tests;
 
-use sngrl\PhpFirebaseCloudMessaging\Notification;
+use Vanderbilt\PhpFirebaseCloudMessaging\Notification;
 
 class NotificationTest extends PhpFirebaseCloudMessagingTestCase
 {

tests/PhpFirebaseCloudMessagingTestCase.php

@@ -1,5 +1,5 @@
 <?php
-namespace sngrl\PhpFirebaseCloudMessaging\Tests;
+namespace Vanderbilt\PhpFirebaseCloudMessaging\Tests;
 
 class PhpFirebaseCloudMessagingTestCase extends \PHPUnit_Framework_TestCase
 {