cloudian: major refactorings, add logout hook on loading

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav 2017-09-26 11:10:42 +05:30
parent 269964c024
commit 7bc74bc442
4 changed files with 33 additions and 10 deletions

View File

@ -0,0 +1,21 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package com.cloudian.cloudstack.response;
public class CloudianEnabledResponse {
}

View File

@ -28,7 +28,18 @@
url: createURL('cloudianIsEnabled'),
async: false,
success: function(json) {
pluginEnabled = (json.cloudianisenabledresponse.success == 'true');
var response = json.cloudianisenabledresponse.cloudianisenabled;
pluginEnabled = (response.enabled == 'true');
if (pluginEnabled) {
var cloudianLogoutUrl = response.url + "logout.htm?";
onLogoutCallback = function() {
g_loginResponse = null;
var csUrl = window.location.href;
var redirect = "redirect=" + encodeURIComponent(csUrl);
window.location.replace(cloudianLogoutUrl + redirect);
return false;
};
}
}
});
return pluginEnabled;
@ -43,15 +54,6 @@
var response = json.cloudianssologinresponse.cloudianssologin;
var cmcWindow = window.open(response.url, "CMCWindow");
cmcWindow.focus();
var cloudianLogoutUrl = response.url.split("ssosecurelogin.htm")[0] + "logout.htm?";
onLogoutCallback = function() {
g_loginResponse = null;
var csUrl = window.location.href;
var redirect = "redirect=" + encodeURIComponent(csUrl);
window.location.replace(cloudianLogoutUrl + redirect);
return false;
};
},
error: function(data) {
description = 'Single-Sign-On failed for Cloudian management console.';