Merge branch 'develop'

Author: chrisbjr

README.md

@@ -71,6 +71,7 @@ class AccountActivated extends Notification
         return FcmMessage::create()
             ->setPriority(FcmMessage::PRIORITY_HIGH)
             ->setTimeToLive(86400)
+            ->setFcmKey('xxxx') // (Optional) Use this to override the FCM key from broadcasting.php
             ->setNotification($fcmNotification);
     }
 }
@@ -81,11 +82,17 @@ class AccountActivated extends Notification
 The `Message` object can differ between different operating systems (Android, iOS, and Chrome). In this perspective, a `Message` object is available for each 
 platform which extends the `FcmMessage` object.
 
-All the methods below are explained and defined in the Firebase Cloud Messaging documentation found here: 
+Mostly all the methods below are explained and defined in the Firebase Cloud Messaging documentation found here: 
 [https://firebase.google.com/docs/cloud-messaging/http-server-ref](https://firebase.google.com/docs/cloud-messaging/http-server-ref)
 
 #### FcmMessage
 
+```php
+setFcmKey(string $fcmKey)
+```
+
+This method can be used to override the default FCM key defined in the `config/broadcasting.php` file.
+
 ```php
 setCondition(string $condition)
 ```

src/FcmChannel.php

@@ -43,9 +43,9 @@ public function send($notifiable, Notification $notification)
         }
 
         // Get the message from the notification class
-        $message = $notification->toFcm($notifiable);
+        $fcmMessage = $notification->toFcm($notifiable);
 
-        if (empty($message)) {
+        if (empty($fcmMessage)) {
             return;
         }
 
@@ -67,10 +67,32 @@ protected function sendToFcm($message)
     {
         try {
             $this->client->request('POST', '/fcm/send', [
-                'body' => $message->toJson(),
+                'headers' => $this->getClientHeaders($fcmMessage),
+                'body' => $fcmMessage->toJson(),
             ]);
         } catch (RequestException $requestException) {
             throw CouldNotSendNotification::serviceRespondedWithAnError($requestException);
         }
     }
+
+    /**
+     * This is used to get the headers for the FCM request. We can add customization to the headers here.
+     *
+     * @param FcmMessage $fcmMessage
+     * @return array
+     */
+    protected function getClientHeaders(FcmMessage $fcmMessage)
+    {
+        $headers = [
+            'Authorization' => sprintf('key=%s', config('broadcasting.connections.fcm.key')),
+            'Content-Type' => 'application/json',
+        ];
+
+        // Override the FCM key from the config
+        if (! empty($fcmMessage->getFcmKey())) {
+            $headers['Authorization'] = sprintf('key=%s', $fcmMessage->getFcmKey());
+        }
+
+        return $headers;
+    }
 }

src/FcmMessage.php

@@ -8,6 +8,11 @@ class FcmMessage
 
     const PRIORITY_HIGH = 'high';
 
+    /**
+     * @var string
+     */
+    protected $fcmKey;
+
     /**
      * @var string
      */
@@ -68,6 +73,27 @@ public static function create()
         return new static();
     }
 
+    /**
+     * @return string
+     */
+    public function getFcmKey()
+    {
+        return $this->fcmKey;
+    }
+
+    /**
+     * This method can be used to override the default FCM key used in the config/broadcasting.php.
+     *
+     * @param string $fcmKey
+     * @return $this
+     */
+    public function setFcmKey($fcmKey)
+    {
+        $this->fcmKey = $fcmKey;
+
+        return $this;
+    }
+
     /**
      * @return string
      */

src/FcmServiceProvider.php

@@ -17,10 +17,6 @@ public function boot()
             ->give(function () {
                 return new Client([
                     'base_uri' => config('broadcasting.connections.fcm.url', FcmChannel::DEFAULT_API_URL),
-                    'headers'  => [
-                        'Authorization' => sprintf('key=%s', config('broadcasting.connections.fcm.key')),
-                        'Content-Type'  => 'application/json',
-                    ],
                 ]);
             });
     }