From 34f5a5dc61fa8faae35f413f558bb953dd30af87 Mon Sep 17 00:00:00 2001 From: OldHawk Date: Sun, 22 Oct 2017 02:12:38 +0800 Subject: [PATCH] fix(users): fix restore password mail send issues --- .../server/controllers/invitations.server.controller.js | 3 +-- .../controllers/users/users.password.server.controller.js | 8 +++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/modules/invitations/server/controllers/invitations.server.controller.js b/modules/invitations/server/controllers/invitations.server.controller.js index 8a141c03..c26f0e24 100644 --- a/modules/invitations/server/controllers/invitations.server.controller.js +++ b/modules/invitations/server/controllers/invitations.server.controller.js @@ -302,8 +302,7 @@ exports.sendOfficial = function (req, res) { if (config.secure && config.secure.ssl === true) { httpTransport = 'https://'; } - - var baseUrl = (httpTransport + req.headers.host) || config.domain; + var baseUrl = req.app.get('domain') || httpTransport + req.headers.host; res.render(path.resolve('modules/invitations/server/templates/invite-sign-up-email'), { to_email: req.body.email, name: req.user.displayName, diff --git a/modules/users/server/controllers/users/users.password.server.controller.js b/modules/users/server/controllers/users/users.password.server.controller.js index ab93f552..7ce6d768 100644 --- a/modules/users/server/controllers/users/users.password.server.controller.js +++ b/modules/users/server/controllers/users/users.password.server.controller.js @@ -16,7 +16,6 @@ var path = require('path'), var smtpTransport = nodemailer.createTransport(config.mailer.options); var traceConfig = config.meanTorrentConfig.trace; -var mtDebug = require(path.resolve('./config/lib/debug')); /** * Forgot for reset password (forgot POST) @@ -38,8 +37,8 @@ exports.forgot = function (req, res, next) { User.findOne({ $or: [ - {username: usernameOrEmail}, - {email: usernameOrEmail} + { username: usernameOrEmail }, + { email: usernameOrEmail } ] }, '-salt -password', function (err, user) { if (err || !user) { @@ -71,8 +70,7 @@ exports.forgot = function (req, res, next) { if (config.secure && config.secure.ssl === true) { httpTransport = 'https://'; } - - var baseUrl = (httpTransport + req.headers.host) || config.domain; + var baseUrl = req.app.get('domain') || httpTransport + req.headers.host; res.render(path.resolve('modules/users/server/templates/reset-password-email'), { name: user.displayName, appName: config.app.title,