diff --git a/backend/src/entities/email/transporter/email-transporter-service.ts b/backend/src/entities/email/transporter/email-transporter-service.ts index 2ad098c75..8a9119633 100644 --- a/backend/src/entities/email/transporter/email-transporter-service.ts +++ b/backend/src/entities/email/transporter/email-transporter-service.ts @@ -4,6 +4,7 @@ import { IMessage } from '../email/email.interface.js'; import { EmailConfigService } from '../email-config/email-config.service.js'; import { IEmailTransporterInterface } from './email-transporter.interface.js'; import { Injectable } from '@nestjs/common'; +import { isSaaS } from '../../../helpers/app/is-saas.js'; @Injectable() export class EmailTransporterService implements IEmailTransporterInterface { private transporter: nodemailer.Transporter; @@ -12,8 +13,9 @@ export class EmailTransporterService implements IEmailTransporterInterface { } public async transportEmail(mail: IMessage): Promise { + const formattedFrom = isSaaS() ? this.formatEmailAddress(mail.from) : mail.from; return await this.transporter.sendMail({ - from: mail.from, + from: formattedFrom, to: mail.to, subject: mail.subject, text: mail.text, @@ -25,4 +27,9 @@ export class EmailTransporterService implements IEmailTransporterInterface { const transportConfig = this.emailConfigService.getEmailServiceConfig(); return nodemailer.createTransport(transportConfig); } + + private formatEmailAddress(email: string): string { + const defaultName = 'Rocketadmin.com'; + return `${defaultName} <${email}>`; + } }