Making some changes to not pass the Authorization header when it is c…

…onfigured for SSO authentication.
intuit · Jun 14, 2017 · 98431be · 98431be
1 parent 3b3039c
commit 98431be
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/modules/ui/app/scripts/app.js b/modules/ui/app/scripts/app.js
@@ -258,7 +258,9 @@ angular.module('wasabi', [
                 if (ConfigFactory.authnType() === 'sso') {
                     window.location = ConfigFactory.noAuthRedirect();
                 }
-                $state.go('signin');
+                else {
+                    $state.go('signin');
+                }
             };
 
             $rootScope.keepAlive = function() {

diff --git a/modules/ui/app/scripts/services/HttpInterceptor.js b/modules/ui/app/scripts/services/HttpInterceptor.js
@@ -34,16 +34,19 @@ angular.module('wasabi.services').factory('HttpInterceptor', ['$rootScope', '$q'
 
             if (Session.accessToken && !/\/savefeedback/.test(config.url)) {
                 // http://stackoverflow.com/questions/7802116/custom-http-authorization-header
-                config.headers.Authorization = Session.tokenType + ' ' + Session.accessToken;
+                if (ConfigFactory.authnType() !== 'sso') {
+                    // Since in this case, the Authorization header is provided by the SSO
+                    config.headers.Authorization = Session.tokenType + ' ' + Session.accessToken;
 
-                if (!$rootScope.isSetTimeout || (config.url && config.url.substring(0,4) === 'http')) {
-                    // Start the timer for logging the user out automatically.
-                    if ($rootScope.isSetTimeout) {
-                        clearTimeouts();
-                    }
-                    if (!/\/logout$/.test(config.url)) {
-                        $rootScope.isSetTimeout = $timeout(doTimeout, ConfigFactory.loginTimeoutWarningTime);
-                        $rootScope.isLogoutTimeout = $timeout(doForcedLogout, ConfigFactory.loginTimeoutTime);
+                    if (!$rootScope.isSetTimeout || (config.url && config.url.substring(0,4) === 'http')) {
+                        // Start the timer for logging the user out automatically.
+                        if ($rootScope.isSetTimeout) {
+                            clearTimeouts();
+                        }
+                        if (!/\/logout$/.test(config.url)) {
+                            $rootScope.isSetTimeout = $timeout(doTimeout, ConfigFactory.loginTimeoutWarningTime);
+                            $rootScope.isLogoutTimeout = $timeout(doForcedLogout, ConfigFactory.loginTimeoutTime);
+                        }
                     }
                 }
             }