etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 14610: cloudstack 3.0 - single sign on - fix a bug that logout didn't work for single-sign-on.

This commit is contained in:
Jessica Wang 2012-04-27 14:08:20 -07:00
parent 64f8135e43
commit a3587abe48
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/scripts/cloudStack.js
View File

@ -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) {