do not start email if argvs not passed

nicola · nicola · commit cb7dd2ea86fc · 2016-05-09T11:58:27.000-04:00
diff --git a/lib/create-app.js b/lib/create-app.js
@@ -44,7 +44,7 @@ function createApp (argv = {}) {
   // Setting options as local variable
   app.locals.ldp = ldp
 
-  if (argv.email) {
+  if (argv.email && argv.email.host) {
     app.locals.email = new EmailService(argv.email)
   }
 
diff --git a/lib/email-service.js b/lib/email-service.js
@@ -18,7 +18,6 @@ class EmailService {
     }
   }
   sendMail (email, callback) {
-    console.log(this.mailer)
     this.mailer.sendMail(email, callback)
   }
 }
diff --git a/lib/identity-provider.js b/lib/identity-provider.js
@@ -534,21 +534,22 @@ IdentityProvider.prototype.post = function (req, res, next) {
       self.create(options, cert, callback)
     },
     function (callback) {
-      if (email) {
-        email.sendEmail({
+      if (email && options.email) {
+        email.sendMail({
           from: `"no-reply" <${email.sender}>`, // sender address
           to: options.email,
           subject: 'Account created',
           text: 'Your account has been created',
           html: '<b>Your account has been created</b>'
-        }, callback)
+        }, (err) => {
+          debug('Error sending email', err)
+          callback()
+        })
       } else {
         callback()
       }
     }
   ], function (err) {
-    // TODO at the moment this will collect the email error
-    // maybe we don't need to do so
     if (err) {
       err.status = err.status || 500
       debug('Error creating ' + options.user + ': ' + err.message)

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ function createApp (argv = {}) {`
`44`	`44`	`// Setting options as local variable`
`45`	`45`	`app.locals.ldp = ldp`
`46`	`46`
`47`		`- if (argv.email) {`
	`47`	`+ if (argv.email && argv.email.host) {`
`48`	`48`	`app.locals.email = new EmailService(argv.email)`
`49`	`49`	`}`
`50`	`50`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@ class EmailService {`
`18`	`18`	`}`
`19`	`19`	`}`
`20`	`20`	`sendMail (email, callback) {`
`21`		`- console.log(this.mailer)`
`22`	`21`	`this.mailer.sendMail(email, callback)`
`23`	`22`	`}`
`24`	`23`	`}`