Merge pull request #3220 from Countly/SER-16-custom-variables-on-push-provided-by-api

Ser 16 custom variables on push provided by api

Author: ar2rsawseen

plugins/push/api/send/audience.js

@@ -678,6 +678,9 @@ class Pusher extends PusherPopper {
                 if (!note) {
                     continue;
                 }
+                for (let k in (this.variables || {})) {
+                    note.pr[k] = this.variables[k];
+                }
 
                 let p = pf[0],
                     d = note._id.getTimestamp().getTime(),

plugins/push/frontend/public/javascripts/countly.models.js

@@ -816,7 +816,12 @@
                     return;
                 }
                 Object.keys(userPropertiesDto).forEach(function(key) {
-                    userPropertiesDto[key].l = countlyPushNotification.helper.findUserPropertyLabelByValue(userPropertiesDto[key].k, userProperties);
+                    if (userPropertiesDto[key].t === UserPropertyTypeEnum.API) {
+                        userPropertiesDto[key].l = userPropertiesDto[key].k;
+                    }
+                    else {
+                        userPropertiesDto[key].l = countlyPushNotification.helper.findUserPropertyLabelByValue(userPropertiesDto[key].k, userProperties);
+                    }
                 });
             },
             getUserPropertyElement: function(index, userProperty) {
@@ -841,6 +846,20 @@
             isAdjacentIndex: function(previousIndex, currentIndex) {
                 return (parseInt(currentIndex) - 1) === parseInt(previousIndex);
             },
+            decodeHtml: function(str) {
+                var map =
+                {
+                    '&': '&',
+                    '&lt;': '<',
+                    '&gt;': '>',
+                    '&quot;': '"',
+                    '&#039;': "'",
+                    '&#39;': "'"
+                };
+                return str.replace(/&amp;|&lt;|&gt;|&quot;|&#039;|&#39;/g, function(m) {
+                    return map[m];
+                });
+            },
             buildMessageText: function(message, userPropertiesDto) {
                 var self = this;
                 if (!message) {
@@ -849,7 +868,35 @@
                 if (!userPropertiesDto) {
                     return message;
                 }
-                var messageInHTMLString = message;
+                // var html = '',
+                //     keys = this.sortUserProperties(userPropertiesDto),
+                //     ranges = [-1]
+                //         .concat(keys.map(function(k) {
+                //             return parseInt(k);
+                //         }))
+                //         .concat([-1]);
+
+                // ranges.forEach(function(start, idx) {
+                //     if (idx === ranges.length - 1) {
+                //         return;
+                //     }
+
+                //     var end = ranges[idx + 1];
+                //     if (end === 0) { // prop at index 0
+                //         return;
+                //     }
+                //     else if (start === -1) { // first range
+                //         html += message.substr(0, end) + self.getUserPropertyElement(end, userPropertiesDto[end]);
+                //     }
+                //     else if (end === -1) { // last range
+                //         html += message.substr(start);
+                //     }
+                //     else {
+                //         html += message.substr(start, end - start) + self.getUserPropertyElement(end, userPropertiesDto[end]);
+                //     }
+                // });
+                // return html;
+                var messageInHTMLString = this.decodeHtml(message);
                 var buildMessageLength = 0;
                 var previousIndex = undefined;
                 this.sortUserProperties(userPropertiesDto).forEach(function(currentUserPropertyIndex, index) {