Revert "refactor(email): set From at transport level instead of per-message"
This reverts commit baa4d693ae.
This commit is contained in:
1 parent
baa4d693ae
commit
8fbbb1dd4b
1 file changed
+4
-4
@@ -127,9 +127,6 @@ export class EmailService implements IEmailService {
|
|||||||
systemEmailRejectUnauthorized,
|
systemEmailRejectUnauthorized,
|
||||||
} = config;
|
} = config;
|
||||||
|
|
||||||
const trimmedDisplayName = systemEmailDisplayName?.trim();
|
|
||||||
const from = trimmedDisplayName && systemEmailAddress ? { name: trimmedDisplayName, address: systemEmailAddress } : systemEmailAddress;
|
|
||||||
|
|
||||||
const emailConfig = {
|
const emailConfig = {
|
||||||
host: systemEmailHost,
|
host: systemEmailHost,
|
||||||
port: Number(systemEmailPort),
|
port: Number(systemEmailPort),
|
||||||
@@ -141,7 +138,6 @@ export class EmailService implements IEmailService {
|
|||||||
name: systemEmailConnectionHost || "localhost",
|
name: systemEmailConnectionHost || "localhost",
|
||||||
connectionTimeout: 5000,
|
connectionTimeout: 5000,
|
||||||
pool: systemEmailPool,
|
pool: systemEmailPool,
|
||||||
from,
|
|
||||||
tls: {
|
tls: {
|
||||||
rejectUnauthorized: systemEmailRejectUnauthorized,
|
rejectUnauthorized: systemEmailRejectUnauthorized,
|
||||||
ignoreTLS: systemEmailIgnoreTLS,
|
ignoreTLS: systemEmailIgnoreTLS,
|
||||||
@@ -163,9 +159,13 @@ export class EmailService implements IEmailService {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const trimmedDisplayName = systemEmailDisplayName?.trim();
|
||||||
|
const from = trimmedDisplayName && systemEmailAddress ? { name: trimmedDisplayName, address: systemEmailAddress } : systemEmailAddress;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const info = await this.transporter.sendMail({
|
const info = await this.transporter.sendMail({
|
||||||
to: to,
|
to: to,
|
||||||
|
from: from,
|
||||||
subject: subject,
|
subject: subject,
|
||||||
html: html,
|
html: html,
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in new issue
Block a user