Nemcio/meanTorrent
1
0
Fork 0
mirror of https://github.com/taobataoma/meanTorrent.git synced 2026-01-24 08:09:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(users): fix restore password mail send issues

Browse Source
This commit is contained in:
OldHawk
2017-10-22 02:12:38 +08:00
parent 701f736082
commit 34f5a5dc61
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/invitations/server/controllers/invitations.server.controller.js
View File

@@ -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,

8
modules/users/server/controllers/users/users.password.server.controller.js
View File

@@ -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,