Merge branch 'master' into dependabot/github_actions/actions-80bdc12dd6

Author: ar2rsawseen

CHANGELOG.md

@@ -1,6 +1,9 @@
 
 ## Version 25.03.x
 
+Dependencies:
+- Bump sass from 1.87.0 to 1.88.0
+
 ## Version 25.03.5
 Fixes:
 - [core] Changes for event omit script to validate data in new model and use countly-request.

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

@@ -58,7 +58,10 @@ pluginManager.dbConnection(DB).then(async(countlyDb) => {
     try {
         let apiDomain = (await countlyDb.collection('plugins').findOne({ _id: 'plugins' }, { _id: 0, 'api.domain': 1 })).api.domain.split('//')[1];
         apiDomain = apiDomain.replace(/(^\w+:|^)\/\//, '').replace(/\/$/, '');
-        let { body } = await httpRequest(`https://stats.count.ly/o/license-generator/list?app_id=633b1796ff6957bdc9360aef&iDisplayStart=0&iDisplayLength=1&iSortCol_0=3&sSortDir_0=desc&query={"domain":{"$regex":"${apiDomain}"}}`, { method: 'POST' }, { auth_token: auth_token });
+        if (apiDomain.indexOf("www.") === 0) {
+            apiDomain = apiDomain.substring(4);
+        }
+        let { body } = await httpRequest(`https://stats.count.ly/o/license-generator/list?app_id=633b1796ff6957bdc9360aef&iDisplayStart=0&iDisplayLength=1&iSortCol_0=3&sSortDir_0=desc&query={"domain":{"$regex":"^${apiDomain}"}}`, { method: 'POST' }, { auth_token: auth_token });
         body = JSON.parse(body);
         let licenseId = '';
         if (body?.aaData?.length) {

bin/scripts/license_installer.js

@@ -92,7 +92,7 @@
     "offline-geocoder": "git+https://github.com/Countly/offline-geocoder.git",
     "properties-parser": "0.6.0",
     "puppeteer": "^24.6.1",
-    "sass": "1.87.0",
+    "sass": "1.88.0",
     "semver": "^7.7.1",
     "sqlite3": "^5.1.7",
     "tslib": "^2.6.3",