@@ -138,7 +138,8 @@ module.exports = function(app, db) {
138138provider : "local"
139139} ) ;
140140
141- if ( token ) {
141+ if ( token && config . mailer . enabled ) {
142+ // user email verification is only enabled if mailer is enabled
142143user . verified = false ;
143144user . verifyToken = token ;
144145} else {
@@ -160,6 +161,10 @@ module.exports = function(app, db) {
160161} ,
161162
162163function sendEmail ( user , done ) {
164+ if ( ! config . mailer . enabled ) {
165+ logger . error ( "config.mailer not enabled; emailing skipped. Have you configured mailer yet?" ) ;
166+ return done ( null , user ) ;
167+ }
163168if ( user . verified ) {
164169// Send welcome email
165170let subject = req . t ( "mailSubjectWelcome" , config ) ;
@@ -257,6 +262,12 @@ module.exports = function(app, db) {
257262} ,
258263
259264function sendWelcomeEmailToUser ( user , done ) {
265+ if ( ! config . mailer . enabled ) {
266+ // this should never be triggered since token only exists when mailer IS configured""
267+ const err = "Trying to send email without config.mailer enabled; emailing skipped. Have you configured mailer yet?" ;
268+ logger . error ( err ) ;
269+ return done ( err , user ) ;
270+ }
260271let subject = req . t ( "mailSubjectWelcome" , config ) ;
261272
262273res . render ( "mail/welcome" , {
@@ -393,6 +404,11 @@ module.exports = function(app, db) {
393404} ,
394405
395406function sendResetEmailToUser ( token , user , done ) {
407+ if ( ! config . mailer . enabled ) {
408+ const err = "Trying to send email without config.mailer enabled; emailing skipped. Have you configured mailer yet?" ;
409+ logger . error ( err ) ;
410+ return done ( err , user ) ;
411+ }
396412let subject = req . t ( "mailSubjectResetPassword" , config ) ;
397413
398414res . render ( "mail/passwordReset" , {
@@ -491,6 +507,11 @@ module.exports = function(app, db) {
491507} ,
492508
493509function sendPasswordChangeEmailToUser ( user , done ) {
510+ if ( ! config . mailer . enabled ) {
511+ const err = "Trying to send email without config.mailer enabled; emailing skipped. Have you configured mailer yet?" ;
512+ logger . error ( err ) ;
513+ return done ( err , user ) ;
514+ }
494515let subject = req . t ( "mailSubjectPasswordChanged" , config ) ;
495516
496517res . render ( "mail/passwordChange" , {
0 commit comments