Merge branch 'develop' into feat/complete-support-for-resend-transport

sailscastshq · Nov 20, 2024 · 479bec6 · 479bec6
2 parents b1c6e77 + 87c1639
commit 479bec6
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/lib/private/mail/send.js b/lib/private/mail/send.js
@@ -76,7 +76,6 @@ module.exports = {
       example: 'Anne Martin',
       defaultsTo: sails.config.mail.from.name || process.env.MAIL_FROM_NAME
     },
-
     layout: {
       description:
         'Set to `false` to disable layouts altogether, or provide the path (relative ' +
@@ -305,14 +304,14 @@ module.exports = {
           template_variables: templateVariables,
           custom_variables: customVariables
         }
+
         let mailtrapInfo
         if (testInboxId) {
           mailtrapInfo = await mailtrap.testing.send({ ...mailtrapMail })
         } else {
           mailtrapInfo = await mailtrap.send({ ...mailtrapMail })
         }
-
-        mailtrapInfo = await mailtrap.send({ ...mailtrapMail })
+
         sails.log.debug('Email sent: %s', mailtrapInfo.message_ids.join(', '))
         break
       case 'resend':