Merge branch 'master' into next

# Conflicts:
#	CHANGELOG.md

Author: ar2rsawseen

.github/workflows/main.yml

@@ -249,6 +249,7 @@ jobs:
     runs-on: ubuntu-latest
 
     strategy:
+      fail-fast: false
       matrix:
         test_type: [dashboard, onboarding]
 
@@ -345,8 +346,13 @@ jobs:
         working-directory: /opt/countly/ui-tests/cypress
         run: |
           ARTIFACT_ARCHIVE_NAME="$(date '+%Y%m%d-%H.%M')_${GITHUB_REPOSITORY#*/}_CI#${{ github.run_number }}_${{ matrix.test_type }}.tar.gz"
+          
           mkdir -p screenshots videos downloads
-          tar zcvf "$ARTIFACT_ARCHIVE_NAME" screenshots videos downloads
+          find screenshots videos downloads -type d -empty -delete
+          
+          TAR_TARGETS=$(ls -d screenshots videos downloads 2>/dev/null || true)
+          
+          tar zcvf "$ARTIFACT_ARCHIVE_NAME" $TAR_TARGETS
           curl -o /tmp/uploader.log -u "${{ secrets.BOX_UPLOAD_AUTH }}" ${{ secrets.BOX_UPLOAD_PATH }} -T "$ARTIFACT_ARCHIVE_NAME"
 
   ui-test-sdk:

CHANGELOG.md

@@ -2,6 +2,17 @@
 Dependencies:
 - Remove SQLite
 
+## Version 25.03.XX
+Fixes:
+- [core] Do not output password in logs on mongodb connection initialisation error
+- [core] Hide error details on render error from response
+- [dashboards] Do not show error if request is cancelled.
+- [dbviewer] Hide api_key from requests
+- [events] Do not throw error in UI on returned group data if there is no segmentation set
+
+Enterprise Fixes:
+-[surveys] Do not fetch survey meta data if plugin is disabled
+
 ## Version 25.03.28
 Fixes:
 - [alerts] Add alert interval validation in the frontend

api/configextender.js

@@ -53,7 +53,12 @@ const OVERRIDES = {
             CA: 'ca',
         },
     },
-
+    COOKIE: {
+        SAMESITE: 'sameSite',
+        HTTPONLY: 'httpOnly',
+        MAXAGE: 'maxAge',
+        MAXAGELOGIN: 'maxAgeLogin',
+    },
     MAIL: {
         CONFIG: {
             IGNORETLS: "ignoreTLS"

api/jobs/ping.js

@@ -51,7 +51,7 @@ class PingJob extends job.Job {
 
                 if (days > 0) {
                     //calculate seconds timestamp of days before today
-                    var startTs = Math.round((new Date().getTime() - (30 * 24 * 60 * 60 * 1000)) / 1000);
+                    var startTs = Math.round((new Date().getTime() - (days * 24 * 60 * 60 * 1000)) / 1000);
 
                     //sync server events - use aggregation pipeline to group by day and action on MongoDB side
                     var aggregationPipeline = [

api/parts/mgmt/tracker.js

@@ -249,6 +249,13 @@ tracker.collectServerData = async function() {
         edition = "Enterprise";
     }
     props.edition = edition;
+    props.hosting = "self-hosted";
+    if (props.edition === "Flex") {
+        props.hosting = "flex";
+    }
+    else if (props.plugins.includes("tracker")) {
+        props.hosting = "countly-hosted";
+    }
     if (common.db.build && common.db.build.version) {
         props.mongodb = common.db.build.version;
     }

api/parts/mgmt/users.js

@@ -861,6 +861,9 @@ usersApi.checkNoteEditPermission = async function(params) {
                     if (error) {
                         return reject(false);
                     }
+                    if (!note) {
+                        return resolve(false);
+                    }
                     const globalAdmin = params.member.global_admin;
                     const isAppAdmin = hasAdminAccess(params.member, params.qstring.app_id);
                     const noteOwner = (note.owner + '' === params.member._id + '');

api/utils/common.js

@@ -1071,7 +1071,7 @@ common.validateArgs = function(args, argProperties, returnErrors) {
             }
 
             if (argProperties[arg]['max-length']) {
-                if (args[arg].length > argProperties[arg]['max-length']) {
+                if (args[arg] && args[arg].length > argProperties[arg]['max-length']) {
                     if (returnErrors) {
                         returnObj.errors.push("Length of " + arg + " is greater than max length value");
                         returnObj.result = false;
@@ -1084,7 +1084,7 @@ common.validateArgs = function(args, argProperties, returnErrors) {
             }
 
             if (argProperties[arg]['min-length']) {
-                if (args[arg].length < argProperties[arg]['min-length']) {
+                if (args[arg] && args[arg].length < argProperties[arg]['min-length']) {
                     if (returnErrors) {
                         returnObj.errors.push("Length of " + arg + " is lower than min length value");
                         returnObj.result = false;

api/utils/requestProcessor.js

@@ -392,7 +392,7 @@ const processRequest = (params) => {
                             options.token = token;
                             render.renderView(options, function(err3) {
                                 if (err3) {
-                                    common.returnMessage(params, 400, 'Error creating screenshot: ' + err3);
+                                    common.returnMessage(params, 400, 'Error creating screenshot. Please check logs for more information.');
                                     return false;
                                 }
                                 common.returnOutput(params, {path: common.config.path + "/images/screenshots/" + imageName});

countly-community

@@ -381,7 +381,7 @@
         },
         getSegments: function(context, res) {
             var segments = [];
-            if (res.meta && res.meta.segments.length > 0) {
+            if (res.meta && res.meta.segments && Array.isArray(res.meta.segments) && res.meta.segments.length > 0) {
                 segments = res.meta.segments.slice();
                 context.commit('setHasSegments', true);
             }