Refine DKIM config for Nodemailer

backend/.env.template

@@ -5,6 +5,10 @@ NEO4J_USERNAME=neo4j
 NEO4J_PASSWORD=letmein
 GRAPHQL_URI=http://localhost:4000
 CLIENT_URI=http://localhost:3000
+
+# EMail
+EMAIL_SUPPORT="devops@ocelot.social"
+EMAIL_DEFAULT_SENDER="devops@ocelot.social"
 SMTP_HOST=
 SMTP_PORT=
 SMTP_IGNORE_TLS=true
@@ -31,7 +35,4 @@ AWS_ENDPOINT=
 AWS_REGION=
 AWS_BUCKET=
 
-EMAIL_DEFAULT_SENDER="devops@ocelot.social"
-EMAIL_SUPPORT="devops@ocelot.social"
-
 CATEGORIES_ACTIVE=false

backend/src/config/index.ts

@@ -40,6 +40,8 @@ const server = {
   JWT_EXPIRES: env.JWT_EXPIRES || '2y',
 }
 
+const hasDKIMData = env.SMTP_DKIM_DOMAINNAME && env.SMTP_DKIM_KEYSELECTOR && env.SMTP_DKIM_PRIVATKEY
+
 const smtp = {
   SMTP_HOST: env.SMTP_HOST,
   SMTP_PORT: env.SMTP_PORT,
@@ -47,9 +49,10 @@ 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,
+  SMTP_DKIM_DOMAINNAME: hasDKIMData ? env.SMTP_DKIM_DOMAINNAME : undefined,
+  SMTP_DKIM_KEYSELECTOR: hasDKIMData ? env.SMTP_DKIM_KEYSELECTOR : undefined,
+  // PEM format: https://docs.progress.com/bundle/datadirect-hybrid-data-pipeline-installation-46/page/PEM-file-format.html
+  SMTP_DKIM_PRIVATKEY: hasDKIMData ? env.SMTP_DKIM_PRIVATKEY.replace(/\\n/g, '\n') : undefined, // replace all "\n" in .env string by real line break
 }
 
 const neo4j = {

backend/src/middleware/helpers/email/sendMail.ts

@@ -37,6 +37,8 @@ if (!hasEmailConfig) {
   }
 } else {
   sendMailCallback = async (templateArgs) => {
+    console.log('CONFIG.SMTP_DKIM_PRIVATKEY: "' + CONFIG.SMTP_DKIM_PRIVATKEY + '"')
+    console.log('templateArgs: ', templateArgs)
     const transporter = nodemailer.createTransport({
       host: CONFIG.SMTP_HOST,
       port: CONFIG.SMTP_PORT,