Skip to content

Commit

Permalink
Add "email.senderAddress" config
Browse files Browse the repository at this point in the history
  • Loading branch information
DEVTomatoCake authored and MaddyUnderStars committed Jul 3, 2024
1 parent b7bf2a1 commit ef13c8c
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
1 change: 1 addition & 0 deletions src/util/config/types/EmailConfiguration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import { SendGridConfiguration } from "./subconfigurations/email/SendGrid";

export class EmailConfiguration {
provider: string | null = null;
senderAddress: string | null = null;
smtp: SMTPConfiguration = new SMTPConfiguration();
mailgun: MailGunConfiguration = new MailGunConfiguration();
mailjet: MailJetConfiguration = new MailJetConfiguration();
Expand Down
4 changes: 3 additions & 1 deletion src/util/util/email/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,9 @@ export const Email: {

const message = {
from:
Config.get().general.correspondenceEmail || "noreply@localhost",
Config.get().email.senderAddress ||
Config.get().general.correspondenceEmail ||
"noreply@localhost",
to: email,
subject,
html,
Expand Down
7 changes: 5 additions & 2 deletions src/util/util/email/transports/SMTP.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,12 @@ export default async function () {
if (!host || !port || secure === null || !username || !password)
return console.error("[Email] SMTP has not been configured correctly.");

if (!Config.get().general.correspondenceEmail)
if (
!Config.get().email.senderAddress &&
!Config.get().general.correspondenceEmail
)
return console.error(
"[Email] Correspondence email has not been configured! This is used as the sender email address.",
'[Email] You have to configure either "email_senderAddress" or "general_correspondenceEmail" for emails to work. The configured value is used as the sender address.',
);

// construct the transporter
Expand Down

0 comments on commit ef13c8c

Please sign in to comment.