[ambari] branch trunk updated: AMBARI-25058 Ambari Admin doesn't redirect user to login page if auth session becomes invalidated. (ababiichuk)

[ababiichuk]

This is an automated email from the ASF dual-hosted git repository.

ababiichuk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 3fc52fc  AMBARI-25058 Ambari Admin doesn't redirect user to login page 
if auth session becomes invalidated. (ababiichuk)
3fc52fc is described below

commit 3fc52fcbe3e8fa221abf22aee6acb69211fb337c
Author: ababiichuk <ababiic...@hortonworks.com>
AuthorDate: Thu Dec 20 15:29:33 2018 +0200

    AMBARI-25058 Ambari Admin doesn't redirect user to login page if auth 
session becomes invalidated. (ababiichuk)
---
 .../main/resources/ui/admin-web/app/scripts/app.js  | 21 +++++++--------------
 .../ui/admin-web/app/scripts/services/Cluster.js    | 15 +++++++--------
 2 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/app.js 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/app.js
index f68a1cf..259536d 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/app.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/app.js
@@ -64,21 +64,14 @@ angular.module('ambariAdminConsole', [
   }]);
 
   $httpProvider.interceptors.push(['$rootScope', '$q', function (scope, $q) {
-    function success(response) {
-      return response;
-    }
-
-    function error(response) {
-      if (response.status == 403) {
-        window.location = Settings.siteRoot;
-        return;
+    return {
+      responseError: function (response) {
+        if (response.status === 403) {
+          window.location = Settings.siteRoot;
+        }
+        return $q.reject(response);
       }
-      return $q.reject(response);
-    }
-
-    return function (promise) {
-      return promise.then(success, error);
-    }
+    };
   }]);
 
   $provide.factory('TimestampHttpInterceptor', [function($q) {
diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/Cluster.js 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/Cluster.js
index 1a99a65..6731317 100644
--- 
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/Cluster.js
+++ 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/Cluster.js
@@ -100,14 +100,13 @@ angular.module('ambariAdminConsole')
       var deferred = $q.defer();
       var url = 
'/services/AMBARI/components/AMBARI_SERVER?fields=RootServiceComponents/properties/user.inactivity.timeout.default';
       $http.get(Settings.baseUrl + url)
-      .then(function(data) {
-        var properties = data.data.RootServiceComponents.properties;
-        var timeout = properties? 
properties['user.inactivity.timeout.default'] : 0;
-        deferred.resolve(timeout);
-      })
-      .catch(function(data) {
-        deferred.reject(data);
-      });
+        .then(function(data) {
+          var properties = data.data.RootServiceComponents.properties;
+          var timeout = properties ? 
properties['user.inactivity.timeout.default'] : 0;
+          deferred.resolve(timeout);
+        }, function (data) {
+          deferred.reject(data);
+        });
 
       return deferred.promise;
     },