Merge branch 'master' into release.24.10

# Conflicts:
#	CHANGELOG.md
#	package-lock.json
#	package.json

Author: ar2rsawseen

CHANGELOG.md

@@ -1,3 +1,11 @@
+## Version xx.xx.xx
+
+Dependencies:
+- Bump sass from 1.81.0 to 1.83.1
+- Bump countly-sdk-nodejs from 24.10.0 to 24.10.1
+- Bump express-rate-limit from 7.4.1 to 7.5.0
+- Bump puppeteer from 23.10.4 to 23.11.1
+
 ## Version 24.10.4
 Fixes:
 - [push] Fixed bug where IOS credentials get mixed up while sending messages from different apps at the same time

api/utils/common.js

@@ -693,7 +693,13 @@ common.getDate = function(timestamp, timezone) {
 * @returns {number} current day of the year
 */
 common.getDOY = function(timestamp, timezone) {
-    var endDate = (timestamp) ? moment.unix(timestamp * 1000) : moment();
+    var endDate;
+    if (timestamp && timestamp.toString().length === 13) {
+        endDate = (timestamp) ? moment.unix(timestamp / 1000) : moment();
+    }
+    else {
+        endDate = (timestamp) ? moment.unix(timestamp) : moment();
+    }
 
     if (timezone) {
         endDate.tz(timezone);

package-lock.json

@@ -48,7 +48,7 @@
     "ejs": "3.1.10",
     "errorhandler": "1.5.1",
     "express": "4.21.2",
-    "express-rate-limit": "7.4.1",
+    "express-rate-limit": "7.5.0",
     "express-session": "1.18.1",
     "form-data": "^4.0.0",
     "formidable": "2.1.1",
@@ -81,7 +81,7 @@
     "offline-geocoder": "git+https://github.com/Countly/offline-geocoder.git",
     "properties-parser": "0.6.0",
     "puppeteer": "^23.8.0",
-    "sass": "1.81.0",
+    "sass": "1.83.1",
     "sqlite3": "^5.1.7",
     "tslib": "^2.6.3",
     "uglify-js": "3.19.3",