Master v25.03.24 into next

.github/workflows/codeql-analysis.yml

@@ -41,7 +41,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
+      uses: github/codeql-action/autobuild@v4
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4

CHANGELOG.md

@@ -2,6 +2,24 @@
 Dependencies:
 - Remove SQLite
 
+## Version 25.03.24
+Fixes:
+- [jobs] Fix condition for scheduling alert job
+
+Enterprise Fixes:
+- [compliance-hub] Fixed query patterns
+- [data-manager] Fixed bug preventing transformation of events ending in a dot
+- [data-manager] Fixed segment data deletion
+- [license] Stop sending metric after license expired
+- [users] Fix add/remove user to profile group
+- [users] Remove link to profile group page after removing user from group
+
+Dependencies
+- Bump @faker-js/faker from 10.0.0 to 10.1.0 in /ui-tests
+- Bump countly-sdk-nodejs from 24.10.2 to 24.10.3
+- Bump lint-staged from 16.2.3 to 16.2.4
+- Bump puppeteer from 24.23.0 to 24.24.1
+
 ## Version 25.03.23
 Fixes:
 - [events] Entries in the event list are now sorted alphabetically

api/parts/data/usage.js

@@ -1125,7 +1125,7 @@ plugins.register("/sdk/user_properties", async function(ob) {
                 userProps.av_major = null;
                 userProps.av_minor = null;
                 userProps.av_patch = null;
-                userProps.av_rel = null;
+                userProps.av_prerel = null;
                 userProps.av_build = null;
             }
         }

api/parts/jobs/job.js

@@ -254,32 +254,33 @@ class Job extends EventEmitter {
 
             this._json.next = next.getTime();
         }
-        if (this.name !== "alerts:monitor") {
-            //check if any job already scheduled or running
-            let query = {
-                status: {"$in": [STATUS.SCHEDULED, STATUS.RUNNING]},
-                name: this.name,
-            };
-            if (this._id) {
-                query._id = {$ne: this._id};
-            }
-            var self = this;
-            return new Promise((resolve, reject) => {
-                Job.findMany(this.db(), query).then(existing => {
-                    if (existing && existing.length) {
-                        log.d('Job already scheduled or running: %j', existing);
-                        this._json.status = STATUS.CANCELLED; //set this as cancelled now as we have other scheduled
-                    }
-                    else {
-                        self._save().then(resolve, reject);
-                    }
 
-                });
-            });
+        //check if any job already scheduled or running
+        let query = {
+            status: {"$in": [STATUS.SCHEDULED, STATUS.RUNNING]},
+            name: this.name,
+        };
+
+        if (this.name === 'alerts:monitor' && this.data && Object.keys(this.data).length) {
+            query.data = this.data;
         }
-        else {
-            return this._save();
+
+        if (this._id) {
+            query._id = {$ne: this._id};
         }
+
+        var self = this;
+        return new Promise((resolve, reject) => {
+            Job.findMany(this.db(), query).then(existing => {
+                if (existing && existing.length) {
+                    log.d('Job already scheduled or running: %j', existing);
+                    this._json.status = STATUS.CANCELLED; //set this as cancelled now as we have other scheduled
+                }
+                else {
+                    self._save().then(resolve, reject);
+                }
+            });
+        });
     }
 
     /**
@@ -1142,4 +1143,4 @@ module.exports = {
     STATUS: STATUS,
     STATUS_MAP: STATUS_MAP,
     debounce: debounce
-};
+};

plugins/compliance-hub/api/api.js

@@ -16,6 +16,13 @@ const FEATURE_NAME = 'compliance_hub';
 
     plugins.internalDrillEvents.push("[CLY]_consent");
 
+    plugins.register("/master", function() {
+        common.db.collection('consent_history').ensureIndex({app_id: 1, device_id: 1}, function() {});
+        common.db.collection('consent_history').ensureIndex({app_id: 1, uid: 1}, function() {});
+        common.db.collection('consent_history').ensureIndex({app_id: 1, type: 1}, function() {});
+        common.db.collection('consent_history').ensureIndex({app_id: 1, ts: 1}, function() {});
+    });
+
     //write api call
     plugins.register("/sdk/user_properties", function(ob) {
         var params = ob.params;
@@ -162,7 +169,8 @@ const FEATURE_NAME = 'compliance_hub';
                         query = {};
                     }
                 }
-                common.db.collection("consent_history").count(query, function(err, total) {
+                query.app_id = params.app_id.toString();
+                common.db.collection("consent_history").countDocuments(query, function(err, total) {
                     if (err) {
                         common.returnMessage(params, 400, err);
                     }
@@ -338,7 +346,7 @@ const FEATURE_NAME = 'compliance_hub';
         var newUid = ob.newUser.uid;
         if (oldUid !== newUid) {
             return new Promise(function(resolve, reject) {
-                common.db.collection('consent_history').update({uid: oldUid}, {'$set': {uid: newUid}}, {multi: true}, function(err) {
+                common.db.collection('consent_history').update({uid: oldUid}, {'$set': {app_id: ob.app_id, uid: newUid}}, {multi: true}, function(err) {
                     if (err) {
                         reject(err);
                         return;
@@ -364,7 +372,7 @@ const FEATURE_NAME = 'compliance_hub';
     plugins.register("/i/apps/delete", function(ob) {
         var appId = ob.appId;
         common.db.collection('consents').remove({'_id': {$regex: appId + ".*"}}, function() {});
-        common.db.collection('consent_history').drop(function() {});
+        common.db.collection('consent_history').deleteMany({app_id: appId}, function() {});
         if (common.drillDb) {
             common.drillDb.collection("drill_events" + crypto.createHash('sha1').update("[CLY]_consent" + appId).digest('hex')).drop(function() {});
         }
@@ -373,7 +381,7 @@ const FEATURE_NAME = 'compliance_hub';
     plugins.register("/i/apps/reset", function(ob) {
         var appId = ob.appId;
         common.db.collection('consents').remove({'_id': {$regex: appId + ".*"}}, function() {});
-        common.db.collection('consent_history').drop(function() {});
+        common.db.collection('consent_history').deleteMany({app_id: appId}, function() {});
         if (common.drillDb) {
             common.drillDb.collection("drill_events" + crypto.createHash('sha1').update("[CLY]_consent" + appId).digest('hex')).drop(function() {});
         }
@@ -382,6 +390,7 @@ const FEATURE_NAME = 'compliance_hub';
     plugins.register("/i/apps/clear_all", function(ob) {
         var appId = ob.appId;
         common.db.collection('consents').remove({'_id': {$regex: appId + ".*"}}, function() {});
+        common.db.collection('consent_history').deleteMany({app_id: appId}, function() {});
         if (common.drillDb) {
             common.drillDb.collection("drill_events" + crypto.createHash('sha1').update("[CLY]_consent" + appId).digest('hex')).drop(function() {});
         }
@@ -391,6 +400,7 @@ const FEATURE_NAME = 'compliance_hub';
         var appId = ob.appId;
         var ids = ob.ids;
         common.db.collection('consents').remove({$and: [{'_id': {$regex: appId + ".*"}}, {'_id': {$nin: ids}}]}, function() {});
+        common.db.collection('consent_history').deleteMany({app_id: appId, ts: {$lt: ob.moment.valueOf()}}, function() {});
         if (common.drillDb) {
             common.drillDb.collection("drill_events" + crypto.createHash('sha1').update("[CLY]_consent" + appId).digest('hex')).remove({ts: {$lt: ob.moment.valueOf()}}, function() {});
         }

plugins/compliance-hub/install.js

@@ -1,32 +0,0 @@
-var pluginManager = require('../pluginManager.js'),
-    async = require('async');
-
-console.log("Installing compliance-hub plugin");
-pluginManager.dbConnection().then((countlyDb) => {
-    countlyDb.collection('apps').find({}).toArray(function(err, apps) {
-
-        if (!apps || err) {
-            console.log("No apps to upgrade");
-            countlyDb.close();
-            return;
-        }
-        function upgrade(app, done) {
-            console.log("Adding compliance-hub indexes to " + app.name);
-            var cnt = 0;
-            function cb() {
-                cnt++;
-                if (cnt == 4) {
-                    done();
-                }
-            }
-            countlyDb.collection('consent_history').ensureIndex({device_id: 1}, cb);
-            countlyDb.collection('consent_history').ensureIndex({uid: 1}, cb);
-            countlyDb.collection('consent_history').ensureIndex({type: 1}, cb);
-            countlyDb.collection('consent_history').ensureIndex({ts: 1}, cb);
-        }
-        async.forEach(apps, upgrade, function() {
-            console.log("Compliance hub plugin installation finished");
-            countlyDb.close();
-        });
-    });
-});