ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject ignite git commit: IGNITE-843 Fix with proxy.
Date Mon, 30 Nov 2015 05:09:08 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 50856911b -> af3d3e841


IGNITE-843 Fix with proxy.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/af3d3e84
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/af3d3e84
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/af3d3e84

Branch: refs/heads/ignite-843-rc2
Commit: af3d3e8419573d253ce0a966ed56958ead8bf2f0
Parents: 5085691
Author: Andrey <anovikov@gridgain.com>
Authored: Mon Nov 30 12:09:02 2015 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Mon Nov 30 12:09:02 2015 +0700

----------------------------------------------------------------------
 modules/control-center-web/src/main/js/routes/public.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/af3d3e84/modules/control-center-web/src/main/js/routes/public.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/routes/public.js b/modules/control-center-web/src/main/js/routes/public.js
index 717b217..84f498f 100644
--- a/modules/control-center-web/src/main/js/routes/public.js
+++ b/modules/control-center-web/src/main/js/routes/public.js
@@ -140,7 +140,7 @@ router.post('/password/forgot', function(req, res) {
                 subject: 'Password Reset',
                 text: 'You are receiving this because you (or someone else) have requested
the reset of the password for your account.\n\n' +
                 'Please click on the following link, or paste this into your browser to complete
the process:\n\n' +
-                'http://' + req.headers.host + '/password/reset?token=' + token + '\n\n'
+
+                'http://' + req.headers['x-forwarded-for'] || req.headers.host + '/password/reset?token='
+ token + '\n\n' +
                 'If you did not request this, please ignore this email and your password
will remain unchanged.\n\n' +
                 '--------------\n' +
                 'Apache Ignite Web Console\n'
@@ -194,7 +194,7 @@ router.post('/password/reset', function(req, res) {
                     subject: 'Your password has been changed',
                     text: 'Hello,\n\n' +
                     'This is a confirmation that the password for your account ' + user.email
+ ' has just been changed.\n\n' +
-                    'Now you can login: http://' + req.headers.host + '\n\n' +
+                    'Now you can login: http://' + req.headers['x-forwarded-for'] || req.headers.host
+ '\n\n' +
                     '--------------\n' +
                     'Apache Ignite Web Console\n'
                 };


Mime
View raw message