Merge pull request #34 from kutia-software-company/1.x

Merge 1.x to Master
kutia-software-company · Jan 10, 2022 · b0a5ea3 · b0a5ea3
2 parents c9b7fc3 + 158fe43
commit b0a5ea3
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 10 deletions.
diff --git a/readme.md b/readme.md
@@ -67,6 +67,10 @@ class MyController
             ->withIcon('https://seeklogo.com/images/F/firebase-logo-402F407EE0-seeklogo.com.png')
             ->withClickAction('admin/notifications')
             ->withPriority('high')
+            ->withAdditionalData([
+                'routing_key' => 'some_screen',
+                'routing_value' => 42
+            ])
             ->sendNotification($this->deviceTokens);
 
         // Or

diff --git a/src/Messages/FirebaseMessage.php b/src/Messages/FirebaseMessage.php
@@ -9,7 +9,7 @@ class FirebaseMessage
     const PRIORITY_NORMAL = 'normal';
 
     private $title;
-    
+
     private $body;
 
     private $clickAction;
@@ -18,6 +18,8 @@ class FirebaseMessage
 
     private $icon;
 
+    private $additionalData;
+
     private $priority = self::PRIORITY_NORMAL;
 
     private $fromArray;
@@ -57,6 +59,13 @@ public function withIcon($icon)
         return $this;
     }
 
+    public function withAdditionalData($additionalData)
+    {
+        $this->additionalData = $additionalData;
+
+        return $this;
+    }
+
     public function withPriority($priority)
     {
         $this->priority = $priority;
@@ -83,6 +92,7 @@ public function asNotification($deviceTokens)
             ->withImage($this->image)
             ->withIcon($this->icon)
             ->withPriority($this->priority)
+            ->withAdditionalData($this->additionalData)
             ->sendNotification($deviceTokens);
     }
 
@@ -98,6 +108,7 @@ public function asMessage($deviceTokens)
             ->withImage($this->image)
             ->withIcon($this->icon)
             ->withPriority($this->priority)
+            ->withAdditionalData($this->additionalData)
             ->sendMessage($deviceTokens);
     }
 }
diff --git a/src/Services/Larafirebase.php b/src/Services/Larafirebase.php
@@ -10,7 +10,7 @@ class Larafirebase
     const PRIORITY_NORMAL = 'normal';
 
     private $title;
-    
+
     private $body;
 
     private $clickAction;
@@ -19,6 +19,8 @@ class Larafirebase
 
     private $icon;
 
+    private $additionalData;
+
     private $priority = self::PRIORITY_NORMAL;
 
     private $fromArray;
@@ -69,6 +71,13 @@ public function withPriority($priority)
         return $this;
     }
 
+    public function withAdditionalData($additionalData)
+    {
+        $this->additionalData = $additionalData;
+
+        return $this;
+    }
+
     public function fromArray($fromArray)
     {
         $this->fromArray = $fromArray;
@@ -94,25 +103,28 @@ public function sendNotification($tokens)
                 'icon' => $this->icon,
                 'click_action' => $this->clickAction
             ],
+            'data' => $this->additionalData,
             'priority' => $this->priority
         );
-
         return $this->callApi($fields);
     }
 
     public function sendMessage($tokens)
     {
+        $data = ($this->fromArray) ? $this->fromArray : [
+            'title' => $this->title,
+            'body' => $this->body,
+            'image' => $this->image,
+            'icon' => $this->icon
+        ];
+
+        $data = $this->additionalData ? array_merge($data, $this->additionalData) : $data;
+
         $fields = array(
             'registration_ids' => $this->validateToken($tokens),
-            'data' => ($this->fromArray) ? $this->fromArray : [
-                'title' => $this->title,
-                'body' => $this->body,
-                'image' => $this->image,
-                'icon' => $this->icon
-            ],
+            'data' => $data,
             'priority' => $this->priority
         );
-
         return $this->callApi($fields);
     }