Merge branch 'master' into next

# Conflicts:
#	CHANGELOG.md

Author: ArtursKadikis

.gitignore

@@ -44,4 +44,5 @@ log/
 log/supervisord/
 plugins/plugins.json.*
 .sdk
-dump
+dump
+dist/

CHANGELOG.md

@@ -1,5 +1,7 @@
 ## Version 25.03.x
 Features:
+- Add ability to allow multiple CORS per app for web apps
+- Add app id and name as view segment for self-tracking
 - [alerts] alerts table default order should be by creation time newest at the top
 - [core] allow tracking Countly dashboard usage with Countly
 - [sdk] Improved and added new Server Config options
@@ -8,6 +10,11 @@ Enterprise Features:
 - [journey_engine] Editing/Deleting/Duplication of blocks and version management
 - [cohorts] [funnels] [ai-assistants] Add cohorts and funnels assistant
 
+Dependencies:
+- Bump body-parser from 1.20.3 to 2.2.0
+- Bump moment-timezone from 0.5.47 to 0.5.48
+- Bump supertest from 7.0.0 to 7.1.0
+
 ## Version 25.03.3
 Fixes:
 - [content_builder] Reformulate asset library and add asset drag and drop upload to builder input

api/lib/countly.common.js

@@ -3,8 +3,16 @@
 * @module "api/lib/countly.common"
 */
 
+/**
+ * @typedef {import('moment-timezone')} MomentTimezone
+ */
+
 /** @lends module:api/lib/countly.common */
 var countlyCommon = {},
+    /**
+     * Reference to momentjs
+     * @type {MomentTimezone} moment
+     */
     moment = require('moment-timezone'),
     underscore = require('underscore');
 
@@ -17,8 +25,8 @@ var _period = "hour",
 
 /**
 * Returns array with unique ticks for period
-* @param {moment} startTimestamp - start of period
-* @param {moment} endTimestamp - end of period
+* @param {MomentTimezone} startTimestamp - start of period
+* @param {MomentTimezone} endTimestamp - end of period
 * @returns {array} unique array ticks for period
 **/
 /*function getTicksBetween(startTimestamp, endTimestamp) {
@@ -46,8 +54,8 @@ var _period = "hour",
 
 /**
 * Returns array with more generalized unique ticks for period
-* @param {moment} startTimestamp - start of period
-* @param {moment} endTimestamp - end of period
+* @param {MomentTimezone} startTimestamp - start of period
+* @param {MomentTimezone} endTimestamp - end of period
 * @returns {array} unique array ticks for period
 **/
 /*function getTicksCheckBetween(startTimestamp, endTimestamp) {
@@ -355,7 +363,7 @@ function fixTimestampToMilliseconds(ts) {
 
 /**
 * Returns a period object used by all time related data calculation functions
-* @param {moment} prmPeriod period to be calculated (optional)
+* @param {MomentTimezone} prmPeriod period to be calculated (optional)
 * @param {string} bucket  - daily or monthly. If bucket is set, period will be modified to fit full months or days
 * @returns {timeObject} time object
 **/

api/utils/common.js

@@ -3,6 +3,11 @@
 * @module api/utils/requestProcessor
 */
 
+/**
+ * @typedef {import('../../types/requestProcessor').Params} Params
+ * @typedef {import('../../types/common').TimeObject} TimeObject
+ */
+
 const Promise = require('bluebird');
 const url = require('url');
 const common = require('./common.js');
@@ -65,7 +70,7 @@ const reloadConfig = function() {
 /**
  * Default request processing handler, which requires request context to operate. Check tcp_example.js
  * @static
- * @param {params} params - for request context. Minimum needed properties listed
+ * @param {Params} params - for request context. Minimum needed properties listed
  * @param {object} params.req - Request object, should not be empty and should contain listed params
  * @param {string} params.req.url - Endpoint URL that you are calling. May contain query string.
  * @param {object} params.req.body - Parsed JSON object with data (same name params will overwrite query string if anything provided there)
@@ -103,9 +108,9 @@ const processRequest = (params) => {
         paths = urlParts.pathname.split("/");
     /**
      * Main request processing object containing all information shared through all the parts of the same request
-     * @typedef params
-     * @type {object}
-     * @global
+     * typedef params
+     * type {object}
+     * global
      * @property {string} href - full URL href
      * @property {http.ServerResponse} res - The HTTP response object
      * @property {http.IncomingMessage} req - The HTTP request object
@@ -182,7 +187,7 @@ const processRequest = (params) => {
      * @property {Object} [member.permission.d[app_id].allowed] - Object containing allowed delete permissions for the app
      * @property {Object} member.eventList - Object containing event collections with replaced app names
      * @property {Object} member.viewList - Object containing view collections with replaced app names
-     * @property {timeObject} time - Time object for the request
+     * @property {TimeObject} time - Time object for the request
      * @property {string} request_hash - Hash of the request data
      * @property {string} [previous_session] - ID of the user's previous session
      * @property {number} [previous_session_start] - Start timestamp of the user's previous session
@@ -3747,7 +3752,7 @@ function processUser(params, initiator, done, try_times) {
 /**
  * Function to fetch app user from db
  * @param  {object} params - params object
- * @returns {promise} - user
+ * @returns {Promise} - user
  */
 const fetchAppUser = (params) => {
     return new Promise((resolve) => {

api/utils/requestProcessor.js

@@ -64,7 +64,7 @@ <h3 :data-test-id="testId + '-header-title'" class="cly-vue-drawer__title-header
                 </div>
                 <div class="cly-vue-drawer__steps-container" v-scroll-shadow :class="{'is-multi-step':isMultiStep}">
                     <div class="bu-columns bu-is-gapless bu-is-mobile" v-if="currentScreenMode === 'full'">
-                        <div class="bu-column bu-is-12">
+                        <div class="bu-column bu-is-12" :data-test-id="testId + '-header-title'">
                             <h3>{{title}}</h3>
                         </div>
                     </div>

frontend/express/public/javascripts/countly/vue/templates/drawer.html

@@ -2043,10 +2043,10 @@ <h4><a href="#/analytics/events/key/{{encodeURIComponent this.name}}">{{this.nam
             Countly2.track_sessions();
 
             //track pageviews automatically
-            Countly2.track_pageview(Countly.getViewName());
+            Countly2.track_pageview(Countly.getViewName(), null, {app_id:countlyCommon.ACTIVE_APP_ID, app_name:countlyGlobal.apps[countlyCommon.ACTIVE_APP_ID]?.name});
 
             $(window).on('hashchange', function() {
-                Countly2.track_pageview(Countly.getViewName());
+                Countly2.track_pageview(Countly.getViewName(), null, {app_id:countlyCommon.ACTIVE_APP_ID, app_name:countlyGlobal.apps[countlyCommon.ACTIVE_APP_ID]?.name});
             });
 
             //display in app messages