From fab145fd0f23902d6ab3272a3e43d4c5a3f9410e Mon Sep 17 00:00:00 2001
From: liapan <liapan@ebay.com>
Date: Fri, 8 Dec 2017 11:36:35 +0800
Subject: [PATCH] KYLIN-2959 SAML logout issue

---
 server/src/main/resources/kylinSecurity.xml | 1 -
 webapp/app/js/controllers/page.js           | 8 +++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/server/src/main/resources/kylinSecurity.xml b/server/src/main/resources/kylinSecurity.xml
index ca49255..9c04ba8 100644
--- a/server/src/main/resources/kylinSecurity.xml
+++ b/server/src/main/resources/kylinSecurity.xml
@@ -358,7 +358,6 @@
         <!-- Handler for successful logout -->
         <bean id="successLogoutHandler"
               class="org.springframework.security.web.authentication.logout.SimpleUrlLogoutSuccessHandler">
-            <property name="defaultTargetUrl" value="/login"/>
         </bean>
 
         <!-- Logger for SAML messages and events -->
diff --git a/webapp/app/js/controllers/page.js b/webapp/app/js/controllers/page.js
index 575f455..0b5ded7 100644
--- a/webapp/app/js/controllers/page.js
+++ b/webapp/app/js/controllers/page.js
@@ -50,8 +50,14 @@ KylinApp.controller('PageCtrl', function ($scope, $q, AccessService, $modal, $lo
   $scope.logout = function () {
     ProjectModel.clear();
     $rootScope.userAction.islogout = true;
+    var logoutURL = Config.service.base;
+    if(kylinConfig.getProperty('kylin.security.profile') === 'saml') {
+      logoutURL += 'saml/logout';
+    } else {
+      logoutURL += 'j_spring_security_logout';
+    }
     $scope.$emit('event:logoutRequest');
-    $http.get(Config.service.base + 'j_spring_security_logout').success(function () {
+    $http.get(logoutURL).success(function () {
       UserService.setCurUser({});
       $scope.username = $scope.password = null;
       $location.path('/login');
-- 
2.8.1