This is an automated email from the ASF dual-hosted git repository.
hapylestat pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.7 by this push:
new dbb1c8c AMBARI-25487.Change authentication method from get to post
(#3185) (hiveww via dgrinenko)
dbb1c8c is described below
commit dbb1c8c435849aed27f4d94d139281acf630a490
Author: Alexander Antonenko <[email protected]>
AuthorDate: Tue Jun 30 19:01:28 2020 +0300
AMBARI-25487.Change authentication method from get to post (#3185) (hiveww
via dgrinenko)
---
ambari-web/app/router.js | 17 +++++++++++++++--
ambari-web/app/utils/ajax/ajax.js | 14 ++++++++++++++
2 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/ambari-web/app/router.js b/ambari-web/app/router.js
index c3a843e..c0a754a 100644
--- a/ambari-web/app/router.js
+++ b/ambari-web/app/router.js
@@ -294,13 +294,13 @@ App.Router = Em.Router.extend({
} else if (xhr.getResponseHeader('User')) {
var user = xhr.getResponseHeader('User');
App.ajax.send({
- name: 'router.login',
+ name: 'router.afterLogin',
sender: self,
data: {
usr: user,
loginName: encodeURIComponent(user)
},
- success: 'loginSuccessCallback',
+ success: 'afterLoginSuccessCallback',
error: 'loginErrorCallback'
}).then(function() {
dfd.resolve(true);
@@ -438,6 +438,19 @@ App.Router = Em.Router.extend({
},
loginSuccessCallback: function(data, opt, params) {
+ App.ajax.send({
+ name: 'router.afterLogin',
+ sender: this,
+ data: {
+ usr: params.usr,
+ loginName: params.loginName
+ },
+ success: 'afterLoginSuccessCallback',
+ error: 'loginErrorCallback'
+ });
+ },
+
+ afterLoginSuccessCallback: function(data, opt, params) {
var self = this;
App.usersMapper.map({"items": [data]});
this.setUserLoggedIn(data.Users.user_name);
diff --git a/ambari-web/app/utils/ajax/ajax.js
b/ambari-web/app/utils/ajax/ajax.js
index 9ebbfee..698d203 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -2401,6 +2401,20 @@ var urls = {
}
},
'router.login': {
+ 'real': '/auth',
+ 'mock': '/data/users/user_{usr}.json',
+ 'type': 'POST',
+ 'format': function (data) {
+ var statusCode = jQuery.extend({}, require('data/statusCodes'));
+ statusCode['403'] = function () {
+ console.log("Error code 403: Forbidden.");
+ };
+ return {
+ statusCode: statusCode
+ };
+ }
+ },
+ 'router.afterLogin': {
'real':
'/users/{loginName}?fields=*,privileges/PrivilegeInfo/cluster_name,privileges/PrivilegeInfo/permission_name',
'mock': '/data/users/user_{usr}.json',
'format': function (data) {
