Merge branch 'master' into dependabot/npm_and_yarn/express-4.21.2

Author: ar2rsawseen

CHANGELOG.md

@@ -1,14 +1,17 @@
 ## Version 24.05.XX
+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
 
 ## Version 24.05.19
 Fixes:

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;
-                        });
+                        }
                     }
                 );
         }

plugins/push/api/send/platforms/i.js

@@ -298,7 +298,8 @@ const CREDS = {
                 return ['Not a private key in P8 format in base64-encoded string'];
             }
 
-            this._data.hash = FORGE.md.sha256.create().update(this._data.key).digest().toHex();
+            const message = this._data.key + this._data.bundle + this._data.keyid + this._data.team;
+            this._data.hash = FORGE.md.sha256.create().update(message).digest().toHex();
         }
 
         /**

plugins/push/api/send/pool.js

@@ -290,7 +290,7 @@ class Pool extends Duplex {
         let unsent = this.state.messages().filter(m => mids.indexOf(m._id.toString()) === -1);
         if (unsent.length) {
             this.log.i('Sending unsent messages to %s: %j', connection.worker.threadId, unsent);
-            connection.write(encode(FRAME.CONNECT, unsent.map(id => this.state.messages().filter(m => m._id.toString() === id)[0])));
+            connection.write(encode(FRAME.CONNECT, unsent.map(_m => this.state.messages().filter(m => m._id.toString() === _m._id.toString())[0])));
         }
         return connection;
     }