Merge pull request #9 from pinguinjkeke/master

Fix multiple messages issue (#6)

Author: alfa6661

src/Exceptions/CouldNotSendNotification.php

@@ -4,6 +4,12 @@
 
 class CouldNotSendNotification extends \Exception
 {
+    /**
+     * Create service exception.
+     *
+     * @param $response
+     * @return static
+     */
     public static function serviceRespondedWithAnError($response)
     {
         return new static('Descriptive error message.');

src/FirebaseChannel.php

@@ -6,59 +6,68 @@
 use paragraph1\phpFCM\Client;
 use paragraph1\phpFCM\Message;
 use paragraph1\phpFCM\Recipient\Device;
+use \Illuminate\Events\Dispatcher;
+use Illuminate\Notifications\Events\NotificationFailed;
 use Illuminate\Notifications\Notification;
 
 class FirebaseChannel
 {
     /**
-     * @var paragraph1\phpFCM\Client
+     * FCM client.
+     *
+     * @var \paragraph1\phpFCM\Client
      */
     protected $client;
 
     /**
-     * @var paragraph1\phpFCM\Message
+     * Events dispatcher.
+     *
+     * @var \Illuminate\Events\Dispatcher
      */
-    protected $message;
+    protected $events;
 
     /**
      * Push Service constructor.
      *
-     * @param paragraph1\phpFCM\Client $client
-     * @param paragraph1\phpFCM\Message $message
+     * @param \paragraph1\phpFCM\Client $client
+     * @param \Illuminate\Events\Dispatcher $events
      */
-    public function __construct(Client $client, Message $message)
+    public function __construct(Client $client, Dispatcher $events)
     {
         $this->client = $client;
-        $this->message = $message;
+        $this->events = $events;
     }
 
     /**
      * Send the given notification.
      *
-     * @param  mixed  $notifiable
-     * @param  \Illuminate\Notifications\Notification  $notification
+     * @param mixed $notifiable
+     * @param \Illuminate\Notifications\Notification $notification
      * @return void
      */
     public function send($notifiable, Notification $notification)
     {
         $devices = $notifiable->routeNotificationFor('firebase');
+
         if (empty($devices)) {
             return;
         }
 
         $firebase = $notification->toFirebase($notifiable);
 
-        foreach ($devices as $device) {
-            $this->message->addRecipient(new Device($device));
-        }
-
-        $this->message->setNotification($firebase->notification)->setData($firebase->data);
-
         try {
             foreach ($devices as $device) {
-                $response = $this->client->send($this->message);
+                $message = (new Message())
+                    ->addRecipient(new Device($device))
+                    ->setNotification($firebase->notification)
+                    ->setData($firebase->data);
+
+                $this->client->send($message);
             }
         } catch (Exception $e) {
+            $this->events->fire(
+                new NotificationFailed($notifiable, $notification, $this)
+            );
         }
     }
 }

src/FirebaseMessage.php

@@ -6,13 +6,25 @@
 
 class FirebaseMessage
 {
+    /**
+     * Notification.
+     *
+     * @var \paragraph1\phpFCM\Notification
+     */
     public $notification;
 
+    /**
+     * Custom data.
+     *
+     * @var array
+     */
     public $data = [];
 
     /**
-     * @param string $body
+     * Static constructor.
      *
+     * @param string $title
+     * @param string $body
      * @return static
      */
     public static function create($title = '', $body = '')
@@ -21,6 +33,9 @@ public static function create($title = '', $body = '')
     }
 
     /**
+     * FirebaseMessage constructor.
+     *
+     * @param string $title
      * @param string $body
      */
     public function __construct($title = '', $body = '')
@@ -35,7 +50,6 @@ public function __construct($title = '', $body = '')
      * Set the message body.
      *
      * @param string $value
-     *
      * @return $this
      */
     public function body($value)
@@ -49,7 +63,6 @@ public function body($value)
      * Set the message title.
      *
      * @param string $value
-     *
      * @return $this
      */
     public function title($value)
@@ -63,7 +76,6 @@ public function title($value)
      * Set notification sound.
      *
      * @param string $value
-     *
      * @return $this
      */
     public function sound($value = 'default')
@@ -77,7 +89,6 @@ public function sound($value = 'default')
      * Set badge number. IOS only.
      *
      * @param int $integer
-     *
      * @return $this
      */
     public function badge($integer)

src/FirebaseServiceProvider.php

@@ -3,7 +3,8 @@
 namespace Alfa6661\Firebase;
 
 use Exception;
-use paragraph1\phpFCM\Client;
+use GuzzleHttp\Client as GuzzleClient;
+use paragraph1\phpFCM\Client as FcmClient;
 use Illuminate\Support\ServiceProvider;
 
 class FirebaseServiceProvider extends ServiceProvider
@@ -14,24 +15,19 @@ class FirebaseServiceProvider extends ServiceProvider
     public function boot()
     {
         $this->app->when(FirebaseChannel::class)
-            ->needs(Client::class)
+            ->needs(FcmClient::class)
             ->give(function () {
                 $firebaseConfig = config('services.firebase');
+
                 if (is_null($firebaseConfig)) {
                     throw new Exception('In order to send notification via firebase you need to add credentials in the `firebase` key of `config.services`.');
                 }
-                $client = new Client();
+
+                $client = new FcmClient();
                 $client->setApiKey($firebaseConfig['api_key']);
-                $client->injectHttpClient(new \GuzzleHttp\Client());
+                $client->injectHttpClient(new GuzzleClient());
 
                 return $client;
             });
     }
-
-    /**
-     * Register the application services.
-     */
-    public function register()
-    {
-    }
 }