Skip to content

Commit e9bd942

Browse files
authored
Merge pull request icebob#44 from sw-yx/master
added config.mailer.enabled and modified routes
2 parents d9e0078 + ad0f3e9 commit e9bd942

File tree

3 files changed

+30
-1
lines changed

3 files changed

+30
-1
lines changed

server/config/base.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@ module.exports = {
6868
cacheTimeout: 5 * 60, // 5 mins
6969

7070
mailer: {
71+
enabled: false, // change this flag to true to turn emailing feature on.
72+
73+
//if enabled = true make sure to configure one of the methods below
7174
from: "noreply@vem-app.com"
7275
/*
7376
transport: "smtp",

server/routes/account.js

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,8 @@ module.exports = function(app, db) {
138138
provider: "local"
139139
});
140140

141-
if (token) {
141+
if (token && config.mailer.enabled) {
142+
// user email verification is only enabled if mailer is enabled
142143
user.verified = false;
143144
user.verifyToken = token;
144145
} else {
@@ -160,6 +161,10 @@ module.exports = function(app, db) {
160161
},
161162

162163
function 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+
}
163168
if (user.verified) {
164169
// Send welcome email
165170
let subject = req.t("mailSubjectWelcome", config);
@@ -257,6 +262,12 @@ module.exports = function(app, db) {
257262
},
258263

259264
function 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+
}
260271
let subject = req.t("mailSubjectWelcome", config);
261272

262273
res.render("mail/welcome", {
@@ -393,6 +404,11 @@ module.exports = function(app, db) {
393404
},
394405

395406
function 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+
}
396412
let subject = req.t("mailSubjectResetPassword", config);
397413

398414
res.render("mail/passwordReset", {
@@ -491,6 +507,11 @@ module.exports = function(app, db) {
491507
},
492508

493509
function 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+
}
494515
let subject = req.t("mailSubjectPasswordChanged", config);
495516

496517
res.render("mail/passwordChange", {

server/routes/auth.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,11 @@ module.exports = function(app, db) {
137137
},
138138

139139
function sendResetEmailToUser(token, user, done) {
140+
if (!config.mailer.enabled) {
141+
const err = "Trying to send email without config.mailer not enabled; emailing skipped. Have you configured mailer yet?";
142+
logger.error(err);
143+
return done(err, user);
144+
}
140145
let subject = req.t("mailSubjectLogin", config);
141146

142147
res.render("mail/passwordLessLogin", {

0 commit comments

Comments
 (0)