SMTP config fallback logic

5 years ago · 0b4d6d6052
1 changed files with 5 additions and 3 deletions
--- a/packages/worker/src/utilities/email.js
+++ b/packages/worker/src/utilities/email.js
@ -114,10 +114,12 @@ async function getSmtpConfiguration(db, workspaceId = null) {

  const customConfig = getScopedConfig(db, params)

-  if (customConfig && !env.SMTP_FALLBACK_ENABLED) {
+  if (customConfig) {
    return customConfig
-  } else {
-    // Use an SMTP fallback configuration from env variables
+  } 
+  
+  // Use an SMTP fallback configuration from env variables
+  if (env.SMTP_FALLBACK_ENABLED) {
    return {
      port: env.SMTP_PORT,
      host: env.SMTP_HOST,