Merge branch 'master' into release.24.10

# Conflicts:
#	CHANGELOG.md
#	package-lock.json
#	package.json

Author: ar2rsawseen

CHANGELOG.md

@@ -1,14 +1,19 @@
 ## Version 24.10.x
+Fixes:
+- [push] Fixed bug where IOS credentials get mixed up while sending messages from different apps at the same time
+- [push] Fixed bug where it crashes in connection pool growth because of a type mismatch in an if condition
 
 Dependencies:
-- Bump puppeteer from 23.8.0 to 23.9.0
-- Bump nodemailer from 6.9.15 to 6.9.16
+- Bump countly-sdk-nodejs from 22.6.0 to 24.10.0
 - Bump countly-sdk-web from 24.4.1 to 24.11.0
-- Bump tslib from 2.7.0 to 2.8.1
 - Bump form-data from 4.0.0 to 4.0.1
 - Bump jimp from 0.22.12 to 1.6.0
 - Bump jsdoc from 4.0.3 to 4.0.4
-- Bump countly-sdk-nodejs from 22.6.0 to 24.10.0
+- Bump nodemailer from 6.9.15 to 6.9.16
+- Bump puppeteer from 23.8.0 to 23.9.0
+- Bump tslib from 2.7.0 to 2.8.1
+- Bump express from 4.21.1 to 4.21.2
+- Bump mocha from 10.2.0 to 10.8.2
 
 ## Version 24.10.3
 Fixes:

bin/scripts/member-managament/delete_old_members.js

@@ -17,7 +17,8 @@ var days = 30;
 //query states not logged in in last N days , but logged in at least once
 
 var ts = Math.round(Date.now() / 1000) - days * 24 * 60 * 60;
-var query = {"$and": [{"last_login": {"$lt": ts}}, {"last_login": {"$exists": true}}]};
+var query = {"$and": [{"last_login": {"$lt": ts}}, {"last_login": {"$exists": true}}, {"global_admin": {"$ne": true}}]};
+// {"global_admin": {"$ne": true}} ensures that global admins are excluded from deletion.
 
 //although mogodb does not return null on $lt, keep like above for safety
 
@@ -120,4 +121,4 @@ function sendRequest(params, callback) {
         console.log(e);
         callback({"err": 'Failed to send'});
     }
-}
+}

frontend/express/public/javascripts/countly/countly.event.js

@@ -89,29 +89,34 @@
                 }))
                 .then(
                     function() {
-                        return $.when($.ajax({
-                            type: "GET",
-                            url: countlyCommon.API_PARTS.data.r,
-                            data: {
-                                "app_id": countlyCommon.ACTIVE_APP_ID,
-                                "method": "events",
-                                "event": _activeEvent,
-                                "segmentation": currentActiveSegmentation,
-                                "period": _period,
-                                "preventRequestAbort": true
-                            },
-                            dataType: "json",
-                            success: function(json) {
-                                if (currentActiveEvent === _activeEvent && currentActiveSegmentation === _activeSegmentation) {
-                                    _activeLoadedEvent = _activeEvent;
-                                    _activeLoadedSegmentation = _activeSegmentation;
-                                    _activeEventDb = json;
-                                    setMeta();
+                        if (_activeEvent) {
+                            return $.when($.ajax({
+                                type: "GET",
+                                url: countlyCommon.API_PARTS.data.r,
+                                data: {
+                                    "app_id": countlyCommon.ACTIVE_APP_ID,
+                                    "method": "events",
+                                    "event": _activeEvent,
+                                    "segmentation": currentActiveSegmentation,
+                                    "period": _period,
+                                    "preventRequestAbort": true
+                                },
+                                dataType: "json",
+                                success: function(json) {
+                                    if (currentActiveEvent === _activeEvent && currentActiveSegmentation === _activeSegmentation) {
+                                        _activeLoadedEvent = _activeEvent;
+                                        _activeLoadedSegmentation = _activeSegmentation;
+                                        _activeEventDb = json;
+                                        setMeta();
+                                    }
                                 }
-                            }
-                        })).then(function() {
+                            })).then(function() {
+                                return true;
+                            });
+                        }
+                        else {
                             return true;
-                        });
+                        }
                     }
                 );
         }