Merge branch 'master' into npm-heroku

coralproject · Dec 22, 2016 · f6a683a · f6a683a
2 parents a5527f9 + 1612009
commit f6a683a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/routes/api/users/index.js b/routes/api/users/index.js
@@ -119,7 +119,7 @@ router.post('/request-password-reset', (req, res, next) => {
 
       const options = {
         subject: 'Password Reset Requested - Talk',
-        from: '[email protected]',
+        from: process.env.TALK_SMTP_FROM_ADDRESS,
         to: email,
         html: resetEmailTemplate({
           token,

diff --git a/services/mailer.js b/services/mailer.js
@@ -1,6 +1,7 @@
 const nodemailer = require('nodemailer');
 
 const smtpRequiredProps = [
+  'TALK_SMTP_FROM_ADDRESS',
   'TALK_SMTP_USERNAME',
   'TALK_SMTP_PASSWORD',
   'TALK_SMTP_HOST'