Merge pull request #411 from jorilallo/jori/reply-to

Added optional reply to address

.env.sample

@@ -18,4 +18,5 @@ SMTP_HOST=
 SMTP_PORT=
 SMTP_USERNAME=
 SMTP_PASSWORD=
-SMTP_SENDER_EMAIL=
+SMTP_FROM_EMAIL=
+SMTP_REPLY_EMAIL=

circle.yml

@@ -10,7 +10,7 @@ machine:
     DATABASE_URL_TEST: postgres://ubuntu@localhost:5432/circle_test
     DATABASE_URL: postgres://ubuntu@localhost:5432/circle_test
     URL: http://localhost:3000
-    SMTP_SENDER_EMAIL: hello@example.com
+    SMTP_FROM_EMAIL: hello@example.com
 
 dependencies:
   override:

server/__snapshots__/mailer.test.js.snap

@@ -49,6 +49,7 @@ Object {
         </body>
       </html>
     ",
+  "replyTo": "hello@example.com",
   "subject": "Welcome to Outline",
   "text": "
 Welcome to Outline!

server/mailer.js

@@ -45,7 +45,8 @@ class Mailer {
 
       try {
         await transporter.sendMail({
-          from: process.env.SMTP_SENDER_EMAIL,
+          from: process.env.SMTP_FROM_EMAIL,
+          replyTo: process.env.SMTP_REPLY_EMAIL || process.env.SMTP_FROM_EMAIL,
           to: data.to,
           subject: data.title,
           html: html,

server/mailer.test.js

@@ -6,6 +6,8 @@ describe('Mailer', () => {
   let sendMailOutput;
 
   beforeEach(() => {
+    process.env.SMTP_FROM_EMAIL = 'hello@example.com';
+
     fakeMailer = new Mailer();
     fakeMailer.transporter = {
       sendMail: output => (sendMailOutput = output),

setupJest.js

@@ -1,3 +1,4 @@
+/* eslint-disable */
 import React from 'react';
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';