浏览代码

Revert "AMBARI-12153. Ambari Web should automatically log the user in if valid HTTP authorization header is present (Single Sign On). (yusaku)"

This reverts commit 0d5cb02de893bf27f1ada92e21f15b06131c759f.
Jaimin Jetly 10 年之前
父节点
当前提交
cd9ed4623a
共有 1 个文件被更改,包括 16 次插入37 次删除
  1. 16 37
      ambari-web/app/router.js

+ 16 - 37
ambari-web/app/router.js

@@ -132,48 +132,27 @@ App.Router = Em.Router.extend({
     var dfd = $.Deferred();
     var self = this;
     var auth = App.db.getAuthenticated();
-    App.ajax.send({
-      name: 'router.login.clusters',
-      sender: this,
-      success: 'onAuthenticationSuccess',
-      error: 'onAuthenticationError'
-    }).complete(function (xhr) {
-      if (xhr.isResolved()) {
-        // if server knows the user and user authenticated by UI
-        if (auth && auth === true) {
+    var authResp = (auth && auth === true);
+    if (authResp) {
+      App.ajax.send({
+        name: 'router.login.clusters',
+        sender: this,
+        success: 'onAuthenticationSuccess',
+        error: 'onAuthenticationError'
+      }).complete(function () {
           dfd.resolve(self.get('loggedIn'));
-          // if server knows the user but UI don't, check the response header
-          // and try to authorize
-        } else if (xhr.getResponseHeader('User')) {
-          var user = xhr.getResponseHeader('User');
-          App.ajax.send({
-            name: 'router.login',
-            sender: self,
-            data: {
-              usr: user,
-              loginName: encodeURIComponent(user)
-            },
-            success: 'loginSuccessCallback',
-            error: 'loginErrorCallback'
-          });
-        } else {
-          self.setAuthenticated(false);
-          dfd.resolve(false);
-        }
-      } else {
-        self.setAuthenticated(false);
-        dfd.resolve(false);
-      }
-    });
+        });
+    } else {
+      this.set('loggedIn', false);
+      dfd.resolve(false);
+    }
     return dfd.promise();
   },
 
   onAuthenticationSuccess: function (data) {
-    if (App.db.getAuthenticated() === true) {
-      this.setAuthenticated(true);
-      if (data.items.length) {
-        this.setClusterInstalled(data);
-      }
+    this.setAuthenticated(true);
+    if (data.items.length) {
+      this.setClusterInstalled(data);
     }
   },