Properly handle misconfigured email service

ericf · Oct 12, 2013 · 8dd1845 · 8dd1845
1 parent a10bd18
commit 8dd1845
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/config/index.js b/config/index.js
@@ -24,7 +24,7 @@ config = {
     invitationSecret: env.INVITATION_SECRET,
 
     mailgun: {
-        endpint: env.MAILGUN_API_SERVER + '/',
+        endpint: env.MAILGUN_API_SERVER && (env.MAILGUN_API_SERVER + '/'),
         domain : env.MAILGUN_DOMAIN,
         secret : env.MAILGUN_API_KEY
     },

diff --git a/lib/email.js b/lib/email.js
@@ -22,6 +22,10 @@ hbs = exphbs.create({
 });
 
 function send(to, subject, body, callback) {
+    if (!(mailgun.endpint && mailgun.domain && mailgun.secret)) {
+        return callback(new Error('Email service not properly configured.'));
+    }
+
     var url = mailgun.endpint + path.join(mailgun.domain, 'messages');
 
     request.post(url, {