From aadcd72c726c9d7dd458c1edf887ce1e39b036ac Mon Sep 17 00:00:00 2001
From: Scott Cressler <longdogz@gmail.com>
Date: Thu, 27 Jul 2017 15:11:20 -0700
Subject: [PATCH] Fixing SSO logout.

---
 modules/ui/app/scripts/controllers/SignInCtrl.js  |  2 +-
 modules/ui/app/scripts/controllers/SignOutCtrl.js | 11 ++++++++---
 modules/ui/constants.json                         |  1 +
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/modules/ui/app/scripts/controllers/SignInCtrl.js b/modules/ui/app/scripts/controllers/SignInCtrl.js
index f50421c4e..7b67c4b12 100644
--- 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
index f0568c2a2..dde237cf8 100644
--- 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
index 54cfc564d..f319f129b 100644
--- a/modules/ui/constants.json
+++ b/modules/ui/constants.json
@@ -2,5 +2,6 @@
     "supportEmail": "",
     "authnType": "basic",
     "noAuthRedirect": "",
+    "ssoLogoutRedirect": "",
     "apiHostBaseUrlValue": "DEFAULT"
 }