Merge branch 'master' into SER-1993-push-token-gets-revoked-on-device-request-if-its-already-in-db

cihadtekin · web-flow · commit 23cb989f9535 · 2024-10-01T18:07:43.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,16 @@
+## Version 24.05.13
+Fixes:
+- [alerts] Fixed bugs related to NPS alerts
+- [crash] Reworked symbol files upload to support larger symbol files
+- [push] Fixed bug that would surface when sending Array or Object related payload
+
+Enterprise fixes:
+- [ab-testing] Slight improvements to the UI and UX
+- [remote-config] Slight improvements to the UI and UX
+
+Enterprise Features:
+- [ab-testing] Improved UI for selecting AB test expiration
+
 ## Version 24.05.12
 Fixes:
 - [dashboards] Fixes for dashboards grid
diff --git a/api/api.js b/api/api.js
@@ -370,10 +370,18 @@ plugins.connectToAllDatabases().then(function() {
                 }
 
                 const form = new formidable.IncomingForm(formidableOptions);
-                req.body = '';
-                req.on('data', (data) => {
-                    req.body += data;
-                });
+                if (/crash_symbols\/(add_symbol|upload_symbol)/.test(req.url)) {
+                    req.body = [];
+                    req.on('data', (data) => {
+                        req.body.push(data);
+                    });
+                }
+                else {
+                    req.body = '';
+                    req.on('data', (data) => {
+                        req.body += data;
+                    });
+                }
 
                 let multiFormData = false;
                 // Check if we have 'multipart/form-data'
@@ -432,4 +440,4 @@ plugins.connectToAllDatabases().then(function() {
 
         plugins.loadConfigs(common.db);
     }
-});
+});
diff --git a/api/parts/data/cache.js b/api/parts/data/cache.js
@@ -971,7 +971,7 @@ class StreamedCollection {
             let [col, last] = await createCollection(this.db, this.name, 1e7);
 
             this.col = col;
-            this.stream = col.find({_id: {$gt: last}}, {tailable: true, awaitData: true, noCursorTimeout: true, numberOfRetries: -1}).stream();
+            this.stream = col.find({_id: {$gt: last}}, {tailable: true, awaitData: true, numberOfRetries: -1}).stream();
 
             this.stream.on('data', doc => {
                 if (this.inserts.indexOf(doc._id.toString()) !== -1) {
diff --git a/api/parts/mgmt/cms.js b/api/parts/mgmt/cms.js
@@ -157,10 +157,21 @@ function syncCMSDataToDB(params) {
 }
 
 cmsApi.saveEntries = function(params) {
+
+    var entries = [];
+    try {
+        entries = JSON.parse(params.qstring.entries);
+    }
+    catch (ex) {
+        log.e(params.qstring.entries);
+        common.returnMessage(params, 400, 'Invalid entries parameter');
+        return;
+    }
+
     transformAndStoreData(
         Object.assign({dataTransformed: true}, params),
         null,
-        JSON.parse(params.qstring.entries),
+        entries,
         function(err1) {
             if (err1) {
                 log.e('An error occured while storing entries in DB: ' + err1);
diff --git a/api/utils/requestProcessor.js b/api/utils/requestProcessor.js
@@ -1824,6 +1824,9 @@ const processRequest = (params) => {
                 switch (paths[3]) {
                 case 'all':
                     validateRead(params, 'core', () => {
+                        if (!params.qstring.query) {
+                            params.qstring.query = {};
+                        }
                         if (typeof params.qstring.query === "string") {
                             try {
                                 params.qstring.query = JSON.parse(params.qstring.query);
@@ -1864,6 +1867,9 @@ const processRequest = (params) => {
                     break;
                 case 'count':
                     validateRead(params, 'core', () => {
+                        if (!params.qstring.query) {
+                            params.qstring.query = {};
+                        }
                         if (typeof params.qstring.query === "string") {
                             try {
                                 params.qstring.query = JSON.parse(params.qstring.query);
@@ -1896,6 +1902,9 @@ const processRequest = (params) => {
                     break;
                 case 'list':
                     validateRead(params, 'core', () => {
+                        if (!params.qstring.query) {
+                            params.qstring.query = {};
+                        }
                         if (typeof params.qstring.query === "string") {
                             try {
                                 params.qstring.query = JSON.parse(params.qstring.query);
diff --git a/frontend/express/public/localization/dashboard/dashboard.properties b/frontend/express/public/localization/dashboard/dashboard.properties
@@ -290,6 +290,8 @@ common.in-last-weeks-plural = in the last {0} weeks
 common.in-last-weeks = in the last week
 common.in-last-months-plural = in the last {0} months
 common.in-last-months = in the last month
+common.in-last-years-plural = in the last {0} years
+common.in-last-years = in the last year
 common.time-period-select.custom-range = Custom range
 common.time-period-select.presets = Presets
 common.time-period-select.last-n = In the last
diff --git a/frontend/express/views/dashboard.html b/frontend/express/views/dashboard.html
@@ -29,6 +29,22 @@
                 ignoreURLs: ["action=refresh", "method=live", "stats.count.ly", "method=get_events", "display_loader=false"]
             }
         };
+        window.loadPlugin = function(plugin, callback, args){
+            if (typeof plugin !== "string") {
+                console.log("when loading plugin, provided plugin was not a string, but a", plugin);
+            }
+            if (typeof callback !== "function") {
+                console.log("when loading plugin", plugin, "provided callback was not a function, but a", callback);
+            }
+            if (countlyGlobal.plugins.indexOf(plugin) !== -1) {
+                if (Array.isArray(args)){
+                    callback.apply(window, args);
+                }
+                else {
+                    callback(args);
+                }
+            }
+        };
     </script>
     <link rel="stylesheet" href="<%- cdn %>stylesheets/font-awesome/css/font-awesome.min.css?<%= countlyVersion %>" />
 	 <link rel="stylesheet" href="<%- cdn %>stylesheets/countly-icons/style.css?<%= countlyVersion %>" />
diff --git a/plugins/pluginManager.js b/plugins/pluginManager.js
@@ -2087,21 +2087,27 @@ var pluginManager = function pluginManager() {
             return value;
         }
         else {
-            return !!myOb;
+            if (myOb === true) {
+                return true;
+            }
+            else {
+                return false;
+            }
         }
     }
     this.isAnyMasked = function() {
+        var result = false;
         if (masking && masking.apps) {
             for (var app in masking.apps) {
                 if (masking.apps[app]) {
-                    return hasAnyValueTrue(masking.apps[app].masking);
+                    result = result || hasAnyValueTrue(masking.apps[app]);
+                    if (result) {
+                        return true;
+                    }
                 }
             }
-            return false;
-        }
-        else {
-            return false;
         }
+        return result;
     };
 
     this.getMaskingSettings = function(appID) {
diff --git a/plugins/populator/api/api.js b/plugins/populator/api/api.js
@@ -210,28 +210,36 @@ const FEATURE_NAME = 'populator';
 
     const saveEnvironment = function(ob) {
         const obParams = ob.params;
-        const users = JSON.parse(ob.params.qstring.users);
-        const setEnviromentInformationOnce = ob.params.qstring.setEnviromentInformationOnce;
-        if (!users || !users.length) {
-            common.returnMessage(obParams, 400, "Missing params: " + users);
-            return false;
-        }
-
-        const environmentId = common.crypto.createHash('sha1').update(users[0].appId + users[0].environmentName).digest('hex');
-        const insertedInformations = [];
-        const createdAt = new Date().getTime();
-        for (let i = 0; i < users.length; i++) {
-            insertedInformations.push({
-                _id: users[i].appId + "_" + users[i].templateId + "_" + environmentId + "_" + users[i].deviceId,
-                userName: users[i].userName,
-                platform: users[i].platform,
-                device: users[i].device,
-                appVersion: users[i].appVersion,
-                custom: users[i].custom,
-                createdAt: createdAt
-            });
-        }
         validateCreate(obParams, FEATURE_NAME, function(params) {
+            var users = [];
+            try {
+                users = JSON.parse(ob.params?.qstring?.users);
+            }
+            catch (e) {
+                log.e(e);
+                users = [];
+            }
+            const setEnviromentInformationOnce = ob.params?.qstring?.setEnviromentInformationOnce ;
+            if (!users || !users.length) {
+                common.returnMessage(obParams, 400, "Missing params: users");
+                return false;
+            }
+
+            const environmentId = common.crypto.createHash('sha1').update(users[0].appId + users[0].environmentName).digest('hex');
+            const insertedInformations = [];
+            const createdAt = new Date().getTime();
+            for (let i = 0; i < users.length; i++) {
+                insertedInformations.push({
+                    _id: users[i].appId + "_" + users[i].templateId + "_" + environmentId + "_" + users[i].deviceId,
+                    userName: users[i].userName,
+                    platform: users[i].platform,
+                    device: users[i].device,
+                    appVersion: users[i].appVersion,
+                    custom: users[i].custom,
+                    createdAt: createdAt
+                });
+            }
+
             if (setEnviromentInformationOnce) {
                 common.db.collection('populator_environments').insertOne({
                     _id: environmentId,
diff --git a/plugins/populator/tests.js b/plugins/populator/tests.js
@@ -0,0 +1,45 @@
+var request = require('supertest');
+var should = require('should');
+var testUtils = require("../../test/testUtils");
+request = request(testUtils.url);
+
+var APP_KEY = "";
+var API_KEY_ADMIN = "";
+var APP_ID = "";
+var DEVICE_ID = "1234567890";
+
+describe('Testing Populator plugin', function() {
+    describe('Testing enviroment endpoint ', function() {
+        it('Set params', function(done) {
+            API_KEY_ADMIN = testUtils.get("API_KEY_ADMIN");
+            APP_ID = testUtils.get("APP_ID");
+            APP_KEY = testUtils.get("APP_KEY");
+            done();
+        });
+
+        it('Try without any params', function(done) {
+            request
+                .get('/i/populator/environment/save')
+                .expect(400)
+                .end(function(err, res) {
+                    var ob = JSON.parse(res.text);
+                    ob.result.should.eql("Missing parameter \"api_key\" or \"auth_token\"");
+                    done();
+                });
+
+        });
+
+        it('Try without "users"', function(done) {
+            request
+                .get('/i/populator/environment/save?api_key=' + API_KEY_ADMIN)
+                .expect(400)
+                .end(function(err, res) {
+                    var ob = JSON.parse(res.text);
+                    ob.result.should.eql("Missing params: users");
+                    done();
+                });
+        });
+    });
+
+
+});
diff --git a/plugins/server-stats/api/parts/stats.js b/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};

Original file line number	Diff line number	Diff line change
`@@ -2087,21 +2087,27 @@ var pluginManager = function pluginManager() {`
`2087`	`2087`	`return value;`
`2088`	`2088`	`}`
`2089`	`2089`	`else {`
`2090`		`- return !!myOb;`
	`2090`	`+ if (myOb === true) {`
	`2091`	`+ return true;`
	`2092`	`+ }`
	`2093`	`+ else {`
	`2094`	`+ return false;`
	`2095`	`+ }`
`2091`	`2096`	`}`
`2092`	`2097`	`}`
`2093`	`2098`	`this.isAnyMasked = function() {`
	`2099`	`+ var result = false;`
`2094`	`2100`	`if (masking && masking.apps) {`
`2095`	`2101`	`for (var app in masking.apps) {`
`2096`	`2102`	`if (masking.apps[app]) {`
`2097`		`- return hasAnyValueTrue(masking.apps[app].masking);`
	`2103`	`+ result = result \|\| hasAnyValueTrue(masking.apps[app]);`
	`2104`	`+ if (result) {`
	`2105`	`+ return true;`
	`2106`	`+ }`
`2098`	`2107`	`}`
`2099`	`2108`	`}`
`2100`		`- return false;`
`2101`		`- }`
`2102`		`- else {`
`2103`		`- return false;`
`2104`	`2109`	`}`
	`2110`	`+ return result;`
`2105`	`2111`	`};`
`2106`	`2112`
`2107`	`2113`	`this.getMaskingSettings = function(appID) {`