From ea69331ea5e78e36b1d17b9c20e771e7867c7464 Mon Sep 17 00:00:00 2001 From: OldHawk Date: Sun, 22 Oct 2017 01:49:53 +0800 Subject: [PATCH] fix(users): fix restore password mail send issues --- .../server/controllers/invitations.server.controller.js | 2 +- .../controllers/users/users.password.server.controller.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/invitations/server/controllers/invitations.server.controller.js b/modules/invitations/server/controllers/invitations.server.controller.js index c26f0e24..148646d6 100644 --- a/modules/invitations/server/controllers/invitations.server.controller.js +++ b/modules/invitations/server/controllers/invitations.server.controller.js @@ -302,7 +302,7 @@ exports.sendOfficial = function (req, res) { if (config.secure && config.secure.ssl === true) { httpTransport = 'https://'; } - var baseUrl = req.app.get('domain') || httpTransport + req.headers.host; + var baseUrl = req.app.get('domain') || config.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 afda726b..3d5c9d14 100644 --- a/modules/users/server/controllers/users/users.password.server.controller.js +++ b/modules/users/server/controllers/users/users.password.server.controller.js @@ -70,7 +70,7 @@ exports.forgot = function (req, res, next) { if (config.secure && config.secure.ssl === true) { httpTransport = 'https://'; } - var baseUrl = config.domain || httpTransport + req.headers.host; + var baseUrl = req.app.get('domain') || config.domain || httpTransport + req.headers.host; res.render(path.resolve('modules/users/server/templates/reset-password-email'), { name: user.displayName, appName: config.app.title,