diff --git a/backend/.env.template b/backend/.env.template index c1742ef93..d7a0945ec 100644 --- a/backend/.env.template +++ b/backend/.env.template @@ -10,6 +10,9 @@ SMTP_PORT= SMTP_IGNORE_TLS=true SMTP_USERNAME= SMTP_PASSWORD= +SMTP_DKIM_DOMAINNAME= +SMTP_DKIM_KEYSELECTOR= +SMTP_DKIM_PRIVATKEY= JWT_SECRET="b/&&7b78BF&fv/Vd" JWT_EXPIRES="2y" diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts index b6098df11..1544e55a6 100644 --- a/backend/src/config/index.ts +++ b/backend/src/config/index.ts @@ -47,6 +47,9 @@ const smtp = { SMTP_SECURE: env.SMTP_SECURE === 'true', SMTP_USERNAME: env.SMTP_USERNAME, SMTP_PASSWORD: env.SMTP_PASSWORD, + SMTP_DKIM_DOMAINNAME: env.SMTP_DKIM_DOMAINNAME, + SMTP_DKIM_KEYSELECTOR: env.SMTP_DKIM_KEYSELECTOR, + SMTP_DKIM_PRIVATKEY: env.SMTP_DKIM_PRIVATKEY, } const neo4j = { diff --git a/backend/src/middleware/helpers/email/sendMail.ts b/backend/src/middleware/helpers/email/sendMail.ts index 359efc91e..c0e54e7f7 100644 --- a/backend/src/middleware/helpers/email/sendMail.ts +++ b/backend/src/middleware/helpers/email/sendMail.ts @@ -5,6 +5,8 @@ import { htmlToText } from 'nodemailer-html-to-text' const hasEmailConfig = CONFIG.SMTP_HOST && CONFIG.SMTP_PORT const hasAuthData = CONFIG.SMTP_USERNAME && CONFIG.SMTP_PASSWORD +const hasDKIMData = + CONFIG.SMTP_DKIM_DOMAINNAME && CONFIG.SMTP_DKIM_KEYSELECTOR && CONFIG.SMTP_DKIM_PRIVATKEY let sendMailCallback: any = async () => {} if (!hasEmailConfig) { @@ -44,6 +46,11 @@ if (!hasEmailConfig) { user: CONFIG.SMTP_USERNAME, pass: CONFIG.SMTP_PASSWORD, }, + dkim: hasDKIMData && { + domainName: CONFIG.SMTP_DKIM_DOMAINNAME, + keySelector: CONFIG.SMTP_DKIM_KEYSELECTOR, + privateKey: CONFIG.SMTP_DKIM_PRIVATKEY, + }, }) transporter.use(