refs #5941 fix(sendToSupport): fix email from

back/methods/osticket/sendToSupport.js

@@ -33,6 +33,7 @@ module.exports = Self => {
             await Self.app.models.EmailUser.findById(ctx.req.accessToken.userId, {fields: ['email']});
 
         let html = `<strong>Motivo</strong>:<br/>${reason}<br/>`;
+        html += `<strong>Usuario</strong>:<br/>${ctx.req.accessToken.userId} ${emailUser.email}<br/>`;
 
         for (const data in additionalData)
             html += `<strong>${data}</strong>:<br/>${tryParse(additionalData[data])}<br/>`;
@@ -40,6 +41,7 @@ module.exports = Self => {
         const subjectReason = JSON.parse(additionalData?.httpRequest)?.data?.error;
         smtp.send({
             to: config.app.reportEmail,
+            from: emailUser.email,
             replyTo: emailUser.email,
             subject:
                 '[Support-Salix] ' +

print/core/smtp.js

@@ -9,7 +9,7 @@ module.exports = {
     },
 
     async send(options) {
-        options.from = `${config.app.senderName} <${config.app.senderEmail}>`;
+        options.from = options.from ?? `${config.app.senderName} <${config.app.senderEmail}>`;
         const env = process.env.NODE_ENV;
         const canSend = env === 'production' || !env || options.force;
 
@@ -19,8 +19,10 @@ module.exports = {
             return Promise.resolve(true);
         }
 
-        if (!env)
+        if (!env) {
             options.to = config.app.senderEmail;
+            options.from = `${config.app.senderName} <${config.app.senderEmail}>`;
+        }
 
         let res;
         let error;