From a3587abe488d7330a969cb8400b73a3b0c6298a2 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Fri, 27 Apr 2012 14:08:20 -0700
Subject: [PATCH] bug 14610: cloudstack 3.0 - single sign on - fix a bug that
 logout didn't work  for single-sign-on.

---
 ui/scripts/cloudStack.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js
index f384af360e9..745ab6f7da0 100644
--- a/ui/scripts/cloudStack.js
+++ b/ui/scripts/cloudStack.js
@@ -81,8 +81,8 @@
       $container: $container,
 
       // Use this for checking the session, to bypass login screen
-      bypassLoginCheck: function(args) { //before login screen
-			  if (g_loginResponse == null) { //not single-sign-on
+      bypassLoginCheck: function(args) { //determine to show or bypass login screen
+			  if (g_loginResponse == null) { //show login screen
 					g_mySession = $.cookie('JSESSIONID');
 					g_sessionKey = $.cookie('sessionKey');
 					g_role = $.cookie('role');        
@@ -97,7 +97,7 @@
 					else
 						g_timezoneoffset = null;   
         }
-				else { //single-sign-on		
+				else { //single-sign-on	(bypass login screen)	
 					g_mySession = $.cookie('JSESSIONID');
 					g_sessionKey = encodeURIComponent(g_loginResponse.sessionkey);
 					g_role = g_loginResponse.type;            
@@ -317,9 +317,11 @@
 						$.cookie('timezone', null);
 						$.cookie('supportELB', null);
 						
+						onLogoutCallback();	 //set g_loginResponse(single-sign-on variable) to null, then bypassLoginCheck() will show login screen.
             document.location.reload();
           },
           error: function() {
+					  onLogoutCallback();	 //set g_loginResponse(single-sign-on variable) to null, then bypassLoginCheck() will show login screen.
             document.location.reload();
           },			
 					beforeSend : function(XMLHttpResponse) {