send push notifications from app + small callback fix for push #286

Author: EddyVerbruggen

firebase.android.js

@@ -24,14 +24,16 @@ var GOOGLE_SIGNIN_INTENT_ID = 123;
     var extras = intent.getExtras();
     if (extras !== null) {
       var result = {
-        foreground: false
+        foreground: false,
+        data: {}
       };
 
       var iterator = extras.keySet().iterator();
       while (iterator.hasNext()) {
         var key = iterator.next();
         if (key !== "from" && key !== "collapse_key") {
           result[key] = extras.get(key);
+          result.data[key] = extras.get(key);
         }
       }
 
@@ -339,7 +341,7 @@ firebase.analytics.logEvent = function (arg) {
 
       resolve();
     } catch (ex) {
-      console.log("Error in firebase.logEvent: " + ex);
+      console.log("Error in firebase.analytics.logEvent: " + ex);
       reject(ex);
     }
   });
@@ -361,7 +363,7 @@ firebase.analytics.setUserProperty = function (arg) {
 
       resolve();
     } catch (ex) {
-      console.log("Error in firebase.setUserProperty: " + ex);
+      console.log("Error in firebase.analytics.setUserProperty: " + ex);
       reject(ex);
     }
   });

firebase.ios.js

@@ -179,6 +179,8 @@ firebase._processPendingNotifications = function() {
         userInfoJSON.title = userInfoJSON.aps.alert.title;
         userInfoJSON.body = userInfoJSON.aps.alert.body;
       }
+      // also, to make the ts.d happy copy all properties to a data element
+      userInfoJSON.data = userInfoJSON;
       // cleanup
       userInfoJSON.aps = undefined;
       firebase._receivedNotificationCallback(userInfoJSON);

index.d.ts

@@ -358,6 +358,10 @@ export interface Message {
      * Not available on Android when the notification was received in the background.
      */
     title?: string;
+    /**
+     * Any other data you may have added to the notification.
+     */
+    data: any;
 }
 
 export interface ProgressStatus {