Fixing SSO logout.

intuit · Jul 27, 2017 · aadcd72 · aadcd72
1 parent f6dc7f2
commit aadcd72
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/modules/ui/app/scripts/controllers/SignInCtrl.js b/modules/ui/app/scripts/controllers/SignInCtrl.js
@@ -105,7 +105,7 @@ angular.module('wasabi.controllers')
                         }
                         else {
                             if (ConfigFactory.authnType() === 'sso') {
-                                window.location = ConfigFactory.noAuthRedirect();
+                                window.location.href = ConfigFactory.noAuthRedirect();
                             }
                             else {
                                 $scope.loginFailed = true;

diff --git a/modules/ui/app/scripts/controllers/SignOutCtrl.js b/modules/ui/app/scripts/controllers/SignOutCtrl.js
@@ -1,12 +1,17 @@
 'use strict';
 
 angular.module('wasabi.controllers')
-    .controller('SignOutCtrl', ['$scope', '$rootScope', '$state', 'AuthFactory', 'AUTH_EVENTS',
-            function ($scope, $rootScope, $state, AuthFactory, AUTH_EVENTS) {
+    .controller('SignOutCtrl', ['$scope', '$rootScope', '$state', 'AuthFactory', 'AUTH_EVENTS', 'ConfigFactory',
+            function ($scope, $rootScope, $state, AuthFactory, AUTH_EVENTS, ConfigFactory) {
                 $scope.signOut = function () {
                     AuthFactory.signOut().$promise.then(function(/*result*/) {
                         //console.log(result);
-                        $state.go('signin');
+                        if (ConfigFactory.authnType() === 'sso') {
+                            window.location.href = ConfigFactory.ssoLogoutRedirect();
+                        }
+                        else {
+                            $state.go('signin');
+                        }
                     }, function(/*reason*/) {
                         $scope.loginFailed = true;
                         $rootScope.$broadcast(AUTH_EVENTS.loginFailed);

diff --git a/modules/ui/constants.json b/modules/ui/constants.json
@@ -2,5 +2,6 @@
     "supportEmail": "",
     "authnType": "basic",
     "noAuthRedirect": "",
+    "ssoLogoutRedirect": "",
     "apiHostBaseUrlValue": "DEFAULT"
 }