Added custom mail host via MAILER_SERVICE_PROVIDER, MAILER_SMTP_PORT, and MAILER_SMTP_SECURE env vars
This commit is contained in:
parent
8ae13ea6c3
commit
f80c0e9bcc
|
@ -95,7 +95,6 @@ exports.resendVerificationEmail = function(req, res, next){
|
||||||
* Signup
|
* Signup
|
||||||
*/
|
*/
|
||||||
exports.signup = function(req, res) {
|
exports.signup = function(req, res) {
|
||||||
|
|
||||||
// For security measures we remove the roles from the req.body object
|
// For security measures we remove the roles from the req.body object
|
||||||
delete req.body.roles;
|
delete req.body.roles;
|
||||||
|
|
||||||
|
@ -106,13 +105,13 @@ exports.signup = function(req, res) {
|
||||||
user.provider = 'local';
|
user.provider = 'local';
|
||||||
// Then save the temporary user
|
// Then save the temporary user
|
||||||
nev.createTempUser(user, function (err, existingPersistentUser, newTempUser) {
|
nev.createTempUser(user, function (err, existingPersistentUser, newTempUser) {
|
||||||
debugger;
|
if (err) {
|
||||||
if (err) {
|
|
||||||
return res.status(400).send({
|
return res.status(400).send({
|
||||||
message: errorHandler.getErrorMessage(err)
|
message: errorHandler.getErrorMessage(err)
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// new user created
|
// new user created
|
||||||
if (newTempUser) {
|
if (newTempUser) {
|
||||||
var URL = newTempUser[nev.options.URLFieldName];
|
var URL = newTempUser[nev.options.URLFieldName];
|
||||||
|
|
|
@ -15,6 +15,14 @@ var mongoose = require('mongoose'),
|
||||||
|
|
||||||
var smtpTransport = nodemailer.createTransport(config.mailer.options);
|
var smtpTransport = nodemailer.createTransport(config.mailer.options);
|
||||||
|
|
||||||
|
// verify connection configuration on startup
|
||||||
|
smtpTransport.verify(function(error, success) {
|
||||||
|
if (error) {
|
||||||
|
console.log('Your mail configuration is incorrect', error);
|
||||||
|
} else {
|
||||||
|
console.log('Mail server is ready to take our messages');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A Validation function for local strategy properties
|
* A Validation function for local strategy properties
|
||||||
|
|
10
config/env/development.js
vendored
10
config/env/development.js
vendored
|
@ -43,7 +43,15 @@ module.exports = {
|
||||||
},
|
},
|
||||||
mailer: {
|
mailer: {
|
||||||
from: process.env.MAILER_FROM || 'no-reply@tellform.com',
|
from: process.env.MAILER_FROM || 'no-reply@tellform.com',
|
||||||
options: {
|
options: process.env.MAILER_SMTP_HOST ? { //Uses custom SMTP if MAILER_SMTP_HOST is set
|
||||||
|
host: process.env.MAILER_SMTP_HOST || '',
|
||||||
|
port: process.env.MAILER_SMTP_PORT || 465,
|
||||||
|
secure: process.env.MAILER_SMTP_SECURE || true,
|
||||||
|
auth: {
|
||||||
|
user: process.env.MAILER_EMAIL_ID || '',
|
||||||
|
pass: process.env.MAILER_PASSWORD || ''
|
||||||
|
}
|
||||||
|
} : {
|
||||||
service: process.env.MAILER_SERVICE_PROVIDER || '',
|
service: process.env.MAILER_SERVICE_PROVIDER || '',
|
||||||
auth: {
|
auth: {
|
||||||
user: process.env.MAILER_EMAIL_ID || '',
|
user: process.env.MAILER_EMAIL_ID || '',
|
||||||
|
|
14
config/env/production.js
vendored
14
config/env/production.js
vendored
|
@ -59,11 +59,19 @@ module.exports = {
|
||||||
},
|
},
|
||||||
mailer: {
|
mailer: {
|
||||||
from: process.env.MAILER_FROM || 'testing@'+process.env.SPARKPOST_SANDBOX_DOMAIN || 'no-reply@tellform.com',
|
from: process.env.MAILER_FROM || 'testing@'+process.env.SPARKPOST_SANDBOX_DOMAIN || 'no-reply@tellform.com',
|
||||||
options: {
|
options: process.env.MAILER_SMTP_HOST ? { //Uses custom SMTP if MAILER_SMTP_HOST is set
|
||||||
|
host: process.env.MAILER_SMTP_HOST || '',
|
||||||
|
port: process.env.MAILER_SMTP_PORT || 465,
|
||||||
|
secure: process.env.MAILER_SMTP_SECURE || true,
|
||||||
|
auth: {
|
||||||
|
user: process.env.MAILER_EMAIL_ID || '',
|
||||||
|
pass: process.env.MAILER_PASSWORD || ''
|
||||||
|
}
|
||||||
|
} : {
|
||||||
service: process.env.MAILER_SERVICE_PROVIDER || '',
|
service: process.env.MAILER_SERVICE_PROVIDER || '',
|
||||||
auth: {
|
auth: {
|
||||||
user: process.env.MAILER_EMAIL_ID || process.env.SPARKPOST_SMTP_USERNAME || '',
|
user: process.env.MAILER_EMAIL_ID || '',
|
||||||
pass: process.env.MAILER_PASSWORD || process.env.SPARKPOST_SMTP_PASSWORD || ''
|
pass: process.env.MAILER_PASSWORD || ''
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
10
config/env/secure.js
vendored
10
config/env/secure.js
vendored
|
@ -66,7 +66,15 @@ module.exports = {
|
||||||
},
|
},
|
||||||
mailer: {
|
mailer: {
|
||||||
from: process.env.MAILER_FROM || '',
|
from: process.env.MAILER_FROM || '',
|
||||||
options: {
|
options: process.env.MAILER_SMTP_HOST ? { //Uses custom SMTP if MAILER_SMTP_HOST is set
|
||||||
|
host: process.env.MAILER_SMTP_HOST || '',
|
||||||
|
port: process.env.MAILER_SMTP_PORT || 587,
|
||||||
|
secure: process.env.MAILER_SMTP_SECURE || true,
|
||||||
|
auth: {
|
||||||
|
user: process.env.MAILER_EMAIL_ID || '',
|
||||||
|
pass: process.env.MAILER_PASSWORD || ''
|
||||||
|
}
|
||||||
|
} : {
|
||||||
service: process.env.MAILER_SERVICE_PROVIDER || '',
|
service: process.env.MAILER_SERVICE_PROVIDER || '',
|
||||||
auth: {
|
auth: {
|
||||||
user: process.env.MAILER_EMAIL_ID || '',
|
user: process.env.MAILER_EMAIL_ID || '',
|
||||||
|
|
10
config/env/test.js
vendored
10
config/env/test.js
vendored
|
@ -52,7 +52,15 @@ module.exports = {
|
||||||
},
|
},
|
||||||
mailer: {
|
mailer: {
|
||||||
from: process.env.MAILER_FROM || 'MAILER_FROM',
|
from: process.env.MAILER_FROM || 'MAILER_FROM',
|
||||||
options: {
|
options: process.env.MAILER_SMTP_HOST ? { //Uses custom SMTP if MAILER_SMTP_HOST is set
|
||||||
|
host: process.env.MAILER_SMTP_HOST || '',
|
||||||
|
port: process.env.MAILER_SMTP_PORT || 587,
|
||||||
|
secure: process.env.MAILER_SMTP_SECURE || true,
|
||||||
|
auth: {
|
||||||
|
user: process.env.MAILER_EMAIL_ID || '',
|
||||||
|
pass: process.env.MAILER_PASSWORD || ''
|
||||||
|
}
|
||||||
|
} : {
|
||||||
service: process.env.MAILER_SERVICE_PROVIDER || '',
|
service: process.env.MAILER_SERVICE_PROVIDER || '',
|
||||||
auth: {
|
auth: {
|
||||||
user: process.env.MAILER_EMAIL_ID || '',
|
user: process.env.MAILER_EMAIL_ID || '',
|
||||||
|
|
Loading…
Reference in a new issue