feat: make config in local.js match config/mail.js (#18)

sailscastshq · Mar 18, 2024 · 9c8994a · 9c8994a
1 parent 1c5d557
commit 9c8994a
Showing 1 changed file with 3 additions and 14 deletions.
diff --git a/lib/private/mail/send.js b/lib/private/mail/send.js
@@ -9,10 +9,7 @@ module.exports = {
       description: 'The mailer to used.',
       extendedDescription:
         'The mailer should be configured properly in config/mails.js. If not specified, the default mailer in sails.config.mail.default will be used',
-      defaultsTo:
-        sails.config.mailer ||
-        sails.config.mail.default ||
-        process.env.MAIL_MAILER
+      defaultsTo: process.env.MAIL_MAILER || sails.config.mail.default
     },
     template: {
       description:
@@ -190,25 +187,18 @@ module.exports = {
         const nodemailer = getModule('nodemailer')
         var transporter = nodemailer.createTransport({
           host:
-            sails.config[mailer]?.host ||
-            sails.config.mail.mailers[mailer]?.host ||
-            process.env.MAIL_HOST,
+            sails.config.mail.mailers[mailer]?.host || process.env.MAIL_HOST,
           port:
-            sails.config[mailer]?.port ||
-            sails.config.mail.mailers[mailer]?.port ||
-            process.env.MAIL_PORT,
+            sails.config.mail.mailers[mailer]?.port || process.env.MAIL_PORT,
           secure:
-            sails.config[mailer]?.secure ||
             sails.config.mail.mailers[mailer]?.secure ||
             process.env.MAIL_SECURE ||
             false,
           auth: {
             user:
-              sails.config[mailer]?.username ||
               sails.config.mail.mailers[mailer]?.username ||
               process.env.MAIL_USERNAME,
             pass:
-              sails.config[mailer]?.password ||
               sails.config.mail.mailers[mailer]?.password ||
               process.env.MAIL_PASSWORD
           }
@@ -232,7 +222,6 @@ module.exports = {
       case 'resend':
         const { Resend } = getModule('resend')
         const apiKey =
-          sails.config[mailer]?.apiKey ||
           sails.config.mail.mailers[mailer]?.apiKey ||
           process.env.RESEND_API_KEY
         const resend = new Resend(apiKey)