Merge branch 'next' into ar2rsawseen/next

Author: ar2rsawseen

.github/workflows/codeql-analysis.yml

@@ -37,7 +37,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/deploy.yml

@@ -19,7 +19,7 @@ jobs:
 
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Enable command line
         shell: bash
@@ -45,10 +45,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Log in to Docker Hub
-        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772
+        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}

.github/workflows/docker-image.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set output
         id: vars
@@ -26,7 +26,7 @@ jobs:
           echo ${{ steps.vars.outputs.tag }}
       
       - name: Log in to Docker Hub
-        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772
+        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -43,7 +43,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set output
         id: vars
@@ -57,7 +57,7 @@ jobs:
           echo ${{ steps.vars.outputs.tag }}
       
       - name: Log in to Docker Hub
-        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772
+        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -74,7 +74,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set output
         id: vars
@@ -88,7 +88,7 @@ jobs:
           echo ${{ steps.vars.outputs.tag }}
       
       - name: Log in to Docker Hub
-        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772
+        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -105,7 +105,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set output
         id: vars
@@ -119,7 +119,7 @@ jobs:
           echo ${{ steps.vars.outputs.tag }}
       
       - name: Log in to Docker Hub
-        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772
+        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}

.github/workflows/main.yml

@@ -26,7 +26,7 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Copy code
         shell: bash
@@ -96,7 +96,7 @@ jobs:
         COUNTLY_CONFIG_API_PREVENT_JOBS: true
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Copy code
         shell: bash
@@ -153,7 +153,7 @@ jobs:
         COUNTLY_CONFIG_API_PREVENT_JOBS: true
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Prepare tests
         shell: bash
@@ -207,7 +207,7 @@ jobs:
         COUNTLY_CONFIG_API_PREVENT_JOBS: true
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Copy code
         shell: bash
@@ -270,7 +270,7 @@ jobs:
         COUNTLY_CONFIG_API_PREVENT_JOBS: true
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Install Chrome
         shell: bash

.github/workflows/release_notice.yml

@@ -17,6 +17,8 @@ jobs:
         uses: slackapi/[email protected]
         with:
           # This data can be any valid JSON from a previous step in the GitHub Action
+          webhook: ${{ secrets.SLACK_RELEASE }}
+          webhook-type: incoming-webhook
           payload: |
             {
               "repository": "${{ github.repository }}",
@@ -28,7 +30,7 @@ jobs:
         env:
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_RELEASE }}
       - name: Send custom JSON data to Discord
-        uses: sarisia/[email protected].3
+        uses: sarisia/[email protected].4
         with:
           webhook: ${{ secrets.DISCORD_WEBHOOK_URL }}
           nodetail: true

.github/workflows/stable-je-deploy.yml

@@ -19,7 +19,7 @@ jobs:
 
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Deploy server
         shell: bash

CHANGELOG.md

@@ -2,9 +2,57 @@
 Dependencies:
 - Remove SQLite
 
+## Version 25.03.19
+Enterprise Fixes
+- [home] Fix home download render issue
+- [journeys] Fix for handling the skip threshold value when saving the journey
+- [journeys] Performance improvement on journey stat user list & UI bugfixes
 
-## Version 25.03.14
+Dependencies:
+- Bump express-rate-limit from 8.0.1 to 8.1.0
+- Bump mongodb from 6.18.0 to 6.19.0
+- Bump nodemailer from 7.0.5 to 7.0.6
+- Bump puppeteer from 24.17.0 to 24.19.0
+- Bump sass from 1.90.0 to 1.92.1
+
+## Version 25.03.18
+Fixes:
+- [server-stats] Add new events to breakdown
+- [server-stats] Fix breakdown event calculation
+
+Enterprise Fixes:
+- [journeys] Fix for clearing content queue when journey is paused
+- [journeys] Fix for content shown event handling
+- [journeys] Fix for performance issues when huge number of journey instances created
+- [journeys] Update skip threshold when journeys are paused
+
+Dependencies:
+- Bump get-random-values from 3.0.0 to 4.0.0
+- Bump puppeteer from 24.16.1 to 24.16.2
+
+## Version 25.03.17
+Enterprise Fixes:
+- [ldap] Recursive user search in ldap added
+- [license] Update metric endpoint permission
 
+Dependencies:
+- Bump puppeteer from 24.16.2 to 24.17.0
+
+## Version 25.03.16
+Enterprise Fixes:
+- [journeys] Fix for skip threshold check in concurrent requests
+- [journeys] Prevent showing journey builder when viewing journey list page
+
+Dependencies:
+- Bump get-random-values from 3.0.0 to 4.0.0
+- Bump puppeteer from 24.16.1 to 24.16.2
+
+## Version 25.03.15
+Enterprise Fixes:
+- [cohorts] Unescape segmentation properties options to prevent duplicated values
+- [ldap] Connection timeout values are added to LDAP config
+
+## Version 25.03.14
 Fixes:
 - [dashboard] Localized missing string in the dashboard
 - [localization] Added French translations
@@ -13,7 +61,12 @@ Enterprise Fixes:
 - [active_directory] Fix for body parser empty request body issue
 
 Dependencies:
+- Bump eslint-plugin-vue from 10.3.0 to 10.4.0
+- Bump fs-extra from 11.3.0 to 11.3.1
 - Bump lint-staged from 16.1.2 to 16.1.4
+- Bump puppeteer from 24.15.0 to 24.16.1
+- Bump sass from 1.89.2 to 1.90.0
+- Bump typescript from 5.8.3 to 5.9.2
 
 
 ## Version 25.03.13

api/utils/countly-request/package-lock.json

@@ -29,6 +29,7 @@ const validateUserForGlobalAdmin = validateGlobalAdmin;
 const validateUserForMgmtReadAPI = validateUser;
 const request = require('countly-request')(plugins.getConfig("security"));
 const Handle = require('../../api/parts/jobs/index.js');
+const render = require('../../api/utils/render.js');
 
 var loaded_configs_time = 0;
 
@@ -362,6 +363,45 @@ const processRequest = (params) => {
                 }
                 break;
             }
+            case '/o/render': {
+                validateUserForRead(params, function() {
+                    var options = {};
+                    var view = params.qstring.view || "";
+                    var route = params.qstring.route || "";
+                    var id = params.qstring.id || "";
+
+                    options.view = view + "#" + route;
+                    options.id = id ? "#" + id : "";
+
+                    var imageName = "screenshot_" + common.crypto.randomBytes(16).toString("hex") + ".png";
+
+                    options.savePath = path.resolve(__dirname, "../../frontend/express/public/images/screenshots/" + imageName);
+                    options.source = "core";
+
+                    authorize.save({
+                        db: common.db,
+                        multi: false,
+                        owner: params.member._id,
+                        ttl: 300,
+                        purpose: "LoginAuthToken",
+                        callback: function(err2, token) {
+                            if (err2) {
+                                common.returnMessage(params, 400, 'Error creating token: ' + err2);
+                                return false;
+                            }
+                            options.token = token;
+                            render.renderView(options, function(err3) {
+                                if (err3) {
+                                    common.returnMessage(params, 400, 'Error creating screenshot: ' + err3);
+                                    return false;
+                                }
+                                common.returnOutput(params, {path: common.config.path + "/images/screenshots/" + imageName});
+                            });
+                        }
+                    });
+                });
+                break;
+            }
             case '/i/app_users': {
                 switch (paths[3]) {
                 case 'create': {

api/utils/requestProcessor.js

@@ -67,7 +67,6 @@ var versionInfo = require('./version.info'),
     url = require('url'),
     authorize = require('../../api/utils/authorizer.js'), //for token validations
     languages = require('../../frontend/express/locale.conf'),
-    render = require('../../api/utils/render.js'),
     rateLimit = require("express-rate-limit"),
     membersUtility = require("./libs/members.js"),
     argon2 = require('argon2'),
@@ -1877,48 +1876,6 @@ Promise.all([plugins.dbConnection(countlyConfig), plugins.dbConnection("countly_
         }
     });
 
-    app.get(countlyConfig.path + '/render', function(req, res) {
-        if (!req.session.uid) {
-            return res.redirect(countlyConfig.path + '/login');
-        }
-
-        var options = {};
-        var view = req.query.view || "";
-        var route = req.query.route || "";
-        var id = req.query.id || "";
-
-        options.view = view + "#" + route;
-        options.id = id ? "#" + id : "";
-
-        var randomString = (+new Date()).toString() + (Math.random()).toString();
-        var imageName = "screenshot_" + sha1Hash(randomString) + ".png";
-
-        options.savePath = path.resolve(__dirname, "./public/images/screenshots/" + imageName);
-        options.source = "core";
-
-        authorize.save({
-            db: countlyDb,
-            multi: false,
-            owner: req.session.uid,
-            ttl: 300,
-            purpose: "LoginAuthToken",
-            callback: function(err2, token) {
-                if (err2) {
-                    console.log(err2);
-                    return res.send(false);
-                }
-                options.token = token;
-                render.renderView(options, function(err3) {
-                    if (err3) {
-                        return res.send(false);
-                    }
-
-                    return res.send({path: countlyConfig.path + "/images/screenshots/" + imageName});
-                });
-            }
-        });
-    });
-
     app.get(countlyConfig.path + '/login/token/:token', function(req, res) {
         membersUtility.loginWithToken(req, function(member) {
             if (member) {