Merge pull request #5598 from Countly/SER-1963-push-buttons-and-badges-are-not-working

[push] fixed migration related push payload issues

Author: ArtursKadikis

plugins/push/api/send/platforms/a.js

@@ -18,7 +18,7 @@ const key = 'a';
  *  - has its own compilation part;
  *  - has its own sending part;
  *  - has no distinct representation in UI, therefore it's virtual.
- * 
+ *
  * Huawei push is only available on select Android devices, therefore it doesn't deserve a separate checkbox in UI from users perspective.
  * Yet notification payload, provider communication and a few other things are different, therefore it's a virtual platform. You can send to huawei directly using
  * API, but whenever you send to Android you'll also send to huawei if Huawei credentials are set.
@@ -27,7 +27,7 @@ const virtuals = ['h'];
 
 /**
  * Extract token & field from token_session request
- * 
+ *
  * @param {object} qstring request params
  * @returns {string[]|undefined} array of [platform, field, token] if qstring has platform-specific token data, undefined otherwise
  */
@@ -40,7 +40,7 @@ function extractor(qstring) {
 
 /**
  * Make an estimated guess about request platform
- * 
+ *
  * @param {string} userAgent user-agent header
  * @returns {string} platform key if it looks like request made by this platform
  */
@@ -104,8 +104,8 @@ class FCM extends Splitter {
     }
 
     /**
-     * Compile & send messages 
-     * 
+     * Compile & send messages
+     *
      * @param {Object[]} data pushes to send, no more than 500 per function call as enforced by stream writableHighWaterMark
      * @param {integer} length number of bytes in data
      * @returns {Promise} sending promise
@@ -139,12 +139,26 @@ class FCM extends Splitter {
             const one = Math.ceil(bytes / pushes.length);
             let content = this.template(pushes[0].m).compile(pushes[0]);
 
+            // new fcm api doesn't allow objects or arrays inside "data" property
+            if (content.data && typeof content.data === "object") {
+                for (let prop in content.data) {
+                    switch (typeof content.data[prop]) {
+                    case "object":
+                        content.data[prop] = JSON.stringify(content.data[prop]);
+                        break;
+                    case "number":
+                        content.data[prop] = String(content.data[prop]);
+                        break;
+                    }
+                }
+            }
+
             let printBody = false;
             const oks = [];
             const errors = {};
             /**
              * Get an error for given code & message, create it if it doesn't exist yet
-             * 
+             *
              * @param {number} code error code
              * @param {string} message error message
              * @returns {SendError} error instance
@@ -158,16 +172,6 @@ class FCM extends Splitter {
             };
             if (!this.legacyApi) {
                 const tokens = pushes.map(p => p.t);
-
-                // new fcm api doesn't allow objects or arrays inside "data" property
-                if (content.data && typeof content.data === "object") {
-                    for (let prop in content.data) {
-                        if (content.data[prop] && typeof content.data[prop] === "object") {
-                            content.data[prop] = JSON.stringify(content.data[prop]);
-                        }
-                    }
-                }
-
                 const messages = tokens.map(token => ({
                     token,
                     ...content,
@@ -375,7 +379,7 @@ class FCM extends Splitter {
 
 /**
  * Create new empty payload for the note object given
- * 
+ *
  * @param {Message} msg NMessageote object
  * @returns {object} empty payload object
  */
@@ -385,7 +389,7 @@ function empty(msg) {
 
 /**
  * Finish data object after setting all the properties
- * 
+ *
  * @param {object} data platform-specific data to finalize
  * @return {object} resulting object
  */
@@ -414,7 +418,7 @@ const fields = [
  */
 const map = {
     /**
-     * Sends sound 
+     * Sends sound
      * @param {Template} t template
      * @param {string} sound sound string
      */
@@ -425,7 +429,7 @@ const map = {
     },
 
     /**
-     * Sends badge 
+     * Sends badge
      * @param {Template} t template
      * @param {number} badge badge (0..N)
      */
@@ -436,7 +440,7 @@ const map = {
     /**
      * Sends buttons
      * !NOTE! buttons & messagePerLocale are inter-dependent as buttons urls/titles are locale-specific
-     * 
+     *
      * @param {Template} t template
      * @param {number} buttons buttons (1..2)
      */
@@ -448,7 +452,7 @@ const map = {
 
     /**
      * Set title string
-     * 
+     *
      * @param {Template} t template
      * @param {String} title title string
      */
@@ -458,7 +462,7 @@ const map = {
 
     /**
      * Set message string
-     * 
+     *
      * @param {Template} t template
      * @param {String} message message string
      */
@@ -468,7 +472,7 @@ const map = {
 
     /**
      * Send collapse_key.
-     * 
+     *
      * @param {Template} template template
      * @param {boolean} ck collapseKey of the Content
      */
@@ -480,7 +484,7 @@ const map = {
 
     /**
      * Send timeToLive.
-     * 
+     *
      * @param {Template} template template
      * @param {boolean} ttl timeToLive of the Content
      */
@@ -492,7 +496,7 @@ const map = {
 
     /**
      * Send notification-tap url
-     * 
+     *
      * @param {Template} template template
      * @param {string} url on-tap url
      */
@@ -503,7 +507,7 @@ const map = {
     /**
      * Send media (picture, video, gif, etc) along with the message.
      * Sets mutable-content in order for iOS extension to be run.
-     * 
+     *
      * @param {Template} template template
      * @param {string} media attached media url
      */
@@ -513,7 +517,7 @@ const map = {
 
     /**
      * Sends custom data along with the message
-     * 
+     *
      * @param {Template} template template
      * @param {Object} data data to be sent
      */
@@ -523,7 +527,7 @@ const map = {
 
     /**
      * Sends user props along with the message
-     * 
+     *
      * @param {Template} template template
      * @param {[string]} extras extra user props to be sent
      * @param {Object} data personalization
@@ -539,7 +543,7 @@ const map = {
 
     /**
      * Sends platform specific fields
-     * 
+     *
      * @param {Template} template template
      * @param {object} specific platform specific props to be sent
      */
@@ -575,7 +579,7 @@ const CREDS = {
     'fcm': class FCMCreds extends Creds {
         /**
          * Validation scheme of this class
-         * 
+         *
          * @returns {object} validateArgs scheme
          */
         static get scheme() {
@@ -588,7 +592,7 @@ const CREDS = {
 
         /**
          * Check credentials for correctness, throw PushError otherwise
-         * 
+         *
          * @throws PushError in case the check fails
          * @returns {undefined}
          */
@@ -631,7 +635,7 @@ const CREDS = {
 
         /**
          * "View" json, that is some truncated/simplified version of credentials that is "ok" to display
-         * 
+         *
          * @returns {object} json without sensitive information
          */
         get view() {