Merge branch 'master' into flex

Author: ar2rsawseen

plugins/push/api/api-push.js

@@ -91,7 +91,7 @@ ipc.attach();
 
 /**
  * Process token session request
- * 
+ *
  * @param {Object} msg IPC message
  */
 async function processTokenSession(msg) {
@@ -146,10 +146,10 @@ async function processTokenSession(msg) {
             });
         }, 10000);
     }
-    else {
-        appusersCollection.updateOne({_id: app_user_id}, {$unset: {[appusersField]: 1}}, function() {});
-        pushCollection.updateOne({_id: uid}, {$unset: {[pushField]: 1}}, function() {});
-    }
+    // else {
+    //     appusersCollection.updateOne({_id: app_user_id}, {$unset: {[appusersField]: 1}}, function() {});
+    //     pushCollection.updateOne({_id: uid}, {$unset: {[pushField]: 1}}, function() {});
+    // }
 }
 
 module.exports.onTokenSession = async(dbAppUser, params) => {

plugins/server-stats/api/parts/stats.js

@@ -246,7 +246,7 @@ function fetchDatapoints(db, filter, options, callback) {
         if (options.monthlyBreakdown) {
             const dataPoints = result
                 .reduce((acc, current) => {
-                    let dp = current.e + current.s;
+                    let dp = (current.e || 0) + (current.s || 0);
 
                     if (/^\[CLY\]_consolidated/.test(current._id)) {
                         // do not count consolidated dp for countly hosted clients
@@ -415,4 +415,4 @@ function getAppName(appId, appNames) {
 }
 
 
-module.exports = {updateDataPoints, isConsolidated, increaseDataPoints, punchCard, fetchDatapoints, getTop, getAppName, internalEventsEnum};
+module.exports = {updateDataPoints, isConsolidated, increaseDataPoints, punchCard, fetchDatapoints, getTop, getAppName, internalEventsEnum};