IGNITE-4472 Fixed became this user. (cherry picked from commit ee832e4)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/75f903fa Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/75f903fa Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/75f903fa Branch: refs/heads/ignite-1.9 Commit: 75f903fa526d7533fa2ffc125790ff76c8d0722a Parents: 5a648b2 Author: Andrey Novikov <[email protected]> Authored: Thu Feb 16 10:41:30 2017 +0700 Committer: Andrey Novikov <[email protected]> Committed: Fri Feb 17 10:19:17 2017 +0700 ---------------------------------------------------------------------- modules/web-console/backend/routes/profile.js | 4 ++-- modules/web-console/backend/services/sessions.js | 6 +----- modules/web-console/backend/services/users.js | 7 ++----- .../web-console/frontend/views/templates/agent-download.jade | 4 ++-- 4 files changed, 7 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/75f903fa/modules/web-console/backend/routes/profile.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/routes/profile.js b/modules/web-console/backend/routes/profile.js index 1d6fccb..76edf72 100644 --- a/modules/web-console/backend/routes/profile.js +++ b/modules/web-console/backend/routes/profile.js @@ -50,7 +50,7 @@ module.exports.factory = function(_, express, mongo, usersService) { if (becomeUsed) { req.session.viewedUser = user; - return user; + return req.user; } return new Promise((resolve, reject) => { @@ -64,7 +64,7 @@ module.exports.factory = function(_, express, mongo, usersService) { }); }); }) - .then(() => usersService.get(req.user, req.session.viewedUser)) + .then((user) => usersService.get(user, req.session.viewedUser)) .then(res.api.ok) .catch(res.api.error); }); http://git-wip-us.apache.org/repos/asf/ignite/blob/75f903fa/modules/web-console/backend/services/sessions.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/services/sessions.js b/modules/web-console/backend/services/sessions.js index 7f62a60..7f3fc73 100644 --- a/modules/web-console/backend/services/sessions.js +++ b/modules/web-console/backend/services/sessions.js @@ -42,11 +42,7 @@ module.exports.factory = (_, mongo, errors) => { return Promise.reject(new errors.IllegalAccessError('Became this user is not permitted. Only administrators can perform this actions.')); return mongo.Account.findById(viewedUserId).lean().exec() - .then((viewedUser) => { - viewedUser.token = session.req.user.token; - - session.viewedUser = viewedUser; - }); + .then((viewedUser) => session.viewedUser = viewedUser); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/75f903fa/modules/web-console/backend/services/users.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/services/users.js b/modules/web-console/backend/services/users.js index 2dd603f..0aff45f 100644 --- a/modules/web-console/backend/services/users.js +++ b/modules/web-console/backend/services/users.js @@ -212,11 +212,8 @@ module.exports.factory = (_, mongo, settings, spacesService, mailsService, activ const becomeUsed = viewedUser && user.admin; - if (becomeUsed) { - user = viewedUser; - - user.becomeUsed = true; - } + if (becomeUsed) + user = _.extend({}, viewedUser, {becomeUsed: true, becameToken: user.token}); else user = user.toJSON(); http://git-wip-us.apache.org/repos/asf/ignite/blob/75f903fa/modules/web-console/frontend/views/templates/agent-download.jade ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/views/templates/agent-download.jade b/modules/web-console/frontend/views/templates/agent-download.jade index f5a6ba0..b913636 100644 --- a/modules/web-console/frontend/views/templates/agent-download.jade +++ b/modules/web-console/frontend/views/templates/agent-download.jade @@ -34,8 +34,8 @@ i.fa.fa-chevron-circle-right(ng-show='!agentLoad.showToken' ng-click='agentLoad.showToken = ! agentLoad.showToken') a(ng-click='agentLoad.showToken = ! agentLoad.showToken') {{agentLoad.showToken ? 'Hide security token...' : 'Show security token...'}} .details-row(ng-show='agentLoad.showToken') - label.labelField Security token: {{user.token}} - i.tipLabel.fa.fa-clipboard(ignite-copy-to-clipboard='{{user.token}}' bs-tooltip='' data-title='Copy security token to clipboard') + label.labelField Security token: {{user.becameToken || user.token}} + i.tipLabel.fa.fa-clipboard(ignite-copy-to-clipboard='{{user.becameToken || user.token}}' bs-tooltip='' data-title='Copy security token to clipboard') i.tipLabel.icon-help(ng-if=lines bs-tooltip='' data-title='The security token is used for authorization of web agent') .agent-download(ng-if='hasAgents') p Connection to Ignite Web Agent is established, but agent failed to connect to Ignite Node
