Merge remote-tracking branch 'origin/master' into fix-allow-changing-datatable-per-row

Author: gabrieloliveirapinto

CHANGELOG.md

@@ -1,5 +1,9 @@
-## Version 25.03.xx
+## Version 25.03.XX
+Fixes:
+- [push] Fixed the options of the request being made during mime detection
+
 Enterprise Fixes:
+- [concurrent_users] Fix alert threshold comparison
 - [surveys] Handle multiple survey submission from same user based on survey visibility
 - [users] Set correct users widget table rows amount according to selected setting
 

plugins/alerts/frontend/public/javascripts/countly.models.js

@@ -569,7 +569,7 @@
                                     compareValue: list[j].users,
                                     compareValue2: list[j].minutes,
                                     alertValues: list[j].email,
-                                    createdByUser: "-",
+                                    createdByUser: list[j].createdByUser || '-',
                                     _canUpdate: countlyAuth.validateUpdate(
                                         FEATURE_NAME,
                                         countlyGlobal.member,

plugins/push/api/proxy.js

@@ -147,10 +147,6 @@ function request(url, method, conf) {
     let opts = {}, proto;
     try {
         let u = new URL(url);
-        opts.host = u.hostname;
-        opts.port = u.port;
-        opts.path = u.pathname;
-        opts.protocol = u.protocol;
         proto = u.protocol.substring(0, u.protocol.length - 1);
         if (!protos[proto]) {
             return new Error('Invalid protocol in url ' + url);
@@ -161,7 +157,7 @@ function request(url, method, conf) {
     }
     catch (e) {
         log.e('Failed to parse media URL', e);
-        opts = {method, url};
+        opts = {method};
         proto = url.substr(0, url.indexOf(':'));
     }
 
@@ -175,9 +171,7 @@ function request(url, method, conf) {
         });
         opts.agent = new Agent();
     }
-
-    opts.url = url;
-    return protos[proto].request(opts);
+    return protos[proto].request(url, opts);
 }