X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=server%2Futils%2Fmailer.js;h=df60e6993aff8c6e500965d729a69c0f8bdacb9f;hb=0234201fb338fc239d6f613c677fa932c7c3697c;hp=9a42a1742a059cf843bd2a2911e32abbb3878df9;hpb=dac395887d96e2d642b209c6db6aaacc3ffacb34;p=vchess.git

diff --git a/server/utils/mailer.js b/server/utils/mailer.js
index 9a42a174..df60e699 100644
--- a/server/utils/mailer.js
+++ b/server/utils/mailer.js
@@ -1,18 +1,22 @@
 const nodemailer = require('nodemailer');
 const params = require("../config/parameters");
 
-module.exports = function(from, to, subject, body, cb)
-{
+module.exports = function(from, to, subject, body, cb) {
   // Avoid the actual sending in development mode
-  if (params.env === 'development')
-  {
+  if (params.env === 'development') {
     console.log("New mail: from " + from + " / to " + to);
     console.log("Subject: " + subject);
-    let msgText = body.split('\\n');
-    msgText.forEach(msg => { console.log(msg); });
-    return cb();
+    console.log(body);
+    if (!cb) cb = (err) => { if (err) console.log(err); }
+    cb();
+    return;
   }
 
+  // Production-only code from here:
+
+  // Default: do nothing (TODO: log somewhere)
+  if (!cb) cb = () => {};
+
   // Create reusable transporter object using the default SMTP transport
   const transporter = nodemailer.createTransport({
     host: params.mail.host,
@@ -35,10 +39,8 @@ module.exports = function(from, to, subject, body, cb)
 
   // Send mail with the defined transport object
   transporter.sendMail(mailOptions, (error, info) => {
-    if (!!error)
-      return cb(error);
     // Ignore info. Option:
     //console.log('Message sent: %s', info.messageId);
-    return cb();
+    cb(error);
   });
 }