Merge branch 'master' into fix/sort-events-alphabetically

Author: ar2rsawseen

CHANGELOG.md

@@ -1,17 +1,40 @@
-## Version 25.03.X
+## Version 25.03.xx
+Fixes:
+- [mail] Add smtp debug option for mail module
+
+Enterprise Fixes:
+- [users] Fixed uploading user profile pictures
+- [funnels] Show notification if funnel results are from cache/task manager
+- [block] Fixed filter for consent events
+
+
+## Version 25.03.22
 Fixes:
 - [alerts] Fix: Migrate alerts to the new events model
-- [oidc] Fix for session state storage
 - [applications] Persist newly created app after page reload
 - [dashboard] Allow users to select text inside the widget without dragging it
+- [oidc] Fix for session state storage
 
 Enterprise Fixes:
-- [users] Update user custom field number formatting
-- [users] Fix condition for custom property update
-- [drill] [survey] Fix duplicate question id
+- [cohorts] Fix query transformation for profile group
 - [drill] [survey] Display survey answer value instead of id in drill result
-- [cohorts] Fix query transformation for chr
+- [drill] [survey] Fix duplicate question id
+- [users] Fix condition for custom property update
+- [users] Update user custom field number formatting
 
+Dependencies:
+- Bump axios from 1.8.2 to 1.12.2 in /plugins/hooks
+- Bump tar-fs from 3.1.0 to 3.1.1
+- Bump nodemailer from 7.0.6 to 7.0.9
+- Bump fs-extra from 11.3.1 to 11.3.2
+- Bump sharp from 0.34.3 to 0.34.4
+- Bump eslint-plugin-vue from 10.4.0 to 10.5.0
+- Bump sass from 1.92.1 to 1.93.2
+- Bump lint-staged from 16.1.6 to 16.2.3
+- Bump puppeteer from 24.20.0 to 24.23.0
+- Bump mongodb from 6.19.0 to 6.20.0
+- Bump typescript from 5.9.2 to 5.9.3
+- Bump semver from 7.7.2 to 7.7.3
 
 ## Version 25.03.21
 Fixes:

api/parts/mgmt/mail.js

@@ -11,8 +11,38 @@ var mail = {},
     versionInfo = require('../../../frontend/express/version.info'),
     authorize = require('../../utils/authorizer'),
     config = require('../../config'),
+    log = require('../../utils/log.js')('mail'),
+    util = require('node:util'),
     ip = require('./ip.js');
 
+const smtpLogger = {};
+
+// Set up logger wrapper
+for (let level of ['trace', 'debug', 'info', 'warn', 'error', 'fatal']) {
+    smtpLogger[level] = (data, message, ...args) => {
+        if (args && args.length) {
+            message = util.format(message, ...args);
+        }
+        if (level === 'error' || level === 'fatal') {
+            log.e(message, data || '');
+        }
+        else if (level === 'warn') {
+            log.w(message, data || '');
+        }
+        else if (level === 'info') {
+            log.i(message, data || '');
+        }
+        else {
+            log.d(message, data || '');
+        }
+    };
+}
+
+if (config.mail && config.mail.config) {
+    config.mail.config.logger = smtpLogger;
+    config.mail.config.debug = true;
+}
+
 if (config.mail && config.mail.transport && config.mail.transport !== "nodemailer-smtp-transport") {
     mail.smtpTransport = nodemailer.createTransport(require(config.mail.transport)(config.mail.config));
 }
@@ -23,7 +53,8 @@ else {
     mail.smtpTransport = nodemailer.createTransport({
         sendmail: true,
         newline: 'unix',
-        path: '/usr/sbin/sendmail'
+        path: '/usr/sbin/sendmail',
+        logger: smtpLogger
     });
 }
 

package-lock.json

@@ -85,9 +85,9 @@
     "method-override": "3.0.0",
     "moment": "2.30.1",
     "moment-timezone": "0.6.0",
-    "mongodb": "6.19.0",
+    "mongodb": "6.20.0",
     "nginx-conf": "2.1.0",
-    "nodemailer": "7.0.7",
+    "nodemailer": "7.0.9",
     "object-hash": "3.0.0",
     "offline-geocoder": "git+https://github.com/Countly/offline-geocoder.git",
     "properties-parser": "0.6.0",