Merge pull request #104 from SpringRoll/release/1.9.0

Release/1.9.0

Author: chipbell4

app/helpers/sendmail.js

@@ -1,13 +1,28 @@
-var nodemailer = require('nodemailer');
+const nodemailer = require('nodemailer');
 
-module.exports = function(mailOptions, callback)
-{
-	var transporter = nodemailer.createTransport({
-		service: 'Gmail',
-		auth: {
-			user: process.env.GMAIL_USER,
-			pass: process.env.GMAIL_PASSWORD
-		}
-	});
-	transporter.sendMail(mailOptions, callback);
-};
+module.exports = function(mailOptions, callback) {
+  let transportConfig;
+
+  const canSendSmtp = process.env.SMTP_USER !== undefined && process.env.SMTP_PASSWORD !== undefined && process.env.SMTP_HOST !== undefined;
+  if (canSendSmtp) {
+    transportConfig = {
+      host: process.env.SMTP_HOST,
+      secure: true,
+      auth: {
+        user: process.env.SMTP_USER,
+        pass: process.env.SMTP_PASSWORD
+      }
+    };
+  } else {
+    transportConfig = {
+      service: 'Gmail',
+      auth: {
+        user: process.env.GMAIL_USER,
+        pass: process.env.GMAIL_PASSWORD
+      }
+    };
+  }
+
+  const transporter = nodemailer.createTransport(transportConfig);
+  transporter.sendMail(mailOptions, callback);
+};

app/public/js/embed.js

@@ -34,7 +34,7 @@ router.post('/', function(req, res, next)
 		{
 			var mailOptions = {
 				to: user.email,
-				from: 'passwordreset@demo.com',
+				from: process.env.SMTP_FROM_USER || 'passwordreset@demo.com',
 				subject: 'Node.js Password Reset',
 				text: 'You are receiving this because you (or someone else) have requested the reset of the password for your account.\n\n' +
 					'Please click on the following link, or paste this into your browser to complete the process:\n\n' +
@@ -64,4 +64,4 @@ router.get('/', function(req, res)
 	});
 });
 
-module.exports = router;
+module.exports = router;

app/routes/forgot.js

@@ -55,7 +55,7 @@ router.post('/:token', function(req, res)
 		{
 			var mailOptions = {
 				to: user.email,
-				from: 'passwordreset@demo.com',
+				from: process.env.SMTP_FROM_USER || 'passwordreset@demo.com',
 				subject: 'Your password has been changed',
 				text: 'Hello,\n\n' +
 					'This is a confirmation that the password for your account ' + user.email + ' has just been changed.\n'
@@ -73,4 +73,4 @@ router.post('/:token', function(req, res)
 	});
 });
 
-module.exports = router;
+module.exports = router;

app/routes/reset.js

@@ -1,5 +1,5 @@
 {
-  "version": "1.8.1",
+  "version": "1.9.0",
   "private": true,
   "devDependencies": {
     "@babel/cli": "^7.2.3",
@@ -70,7 +70,7 @@
     "mongoose-type-email": "^1.0.5",
     "mongoose-types": "^1.0.3",
     "mongoose-unique-validator": "^0.4.1",
-    "nodemailer": "^1.3.2",
+    "nodemailer": "^6.4.3",
     "passport": "^0.2.1",
     "passport-local": "^1.0.0",
     "semver": "^5.0.1",

npm-shrinkwrap.json

@@ -172,7 +172,7 @@ const start = () => {
       query: queryArgs.length ? '?' + queryArgs.join('&') : ''
     })
     .catch(err => {
-      err.json().then(({ error }) => alert(error));
+      alert(err.message);
     })
 };