mirror of https://github.com/apache/cloudstack.git
cloudian: ui plugin enable/disable based on api/setting value
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
parent
32ffe1e497
commit
d4085ac835
|
|
@ -62,7 +62,7 @@ public class CloudianConnectorImpl extends ComponentLifecycleBase implements Clo
|
|||
public String generateSsoUrl() {
|
||||
// add user/group in CMC if not available
|
||||
// return generated login url using sso shared key
|
||||
return null;
|
||||
return "https://cmc.hs.yadav.xyz:8443/Cloudian/";
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -58,7 +58,6 @@ public class CloudianIsEnabledCmd extends BaseCmd {
|
|||
final boolean isEnabled = !connector.isConnectorDisabled();
|
||||
final SuccessResponse response = new SuccessResponse();
|
||||
response.setSuccess(isEnabled);
|
||||
response.setDisplayText(isEnabled ? "Cloudian Connector is enabled" : "Cloudian Connector is disabled");
|
||||
response.setResponseName(getCommandName());
|
||||
setResponseObject(response);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -57,6 +57,7 @@ public class CloudianSsoLoginCmd extends BaseCmd {
|
|||
final CloudianSsoLoginResponse response = new CloudianSsoLoginResponse();
|
||||
response.setSsoRedirectUrl(connector.generateSsoUrl());
|
||||
response.setResponseName(getCommandName());
|
||||
response.setObjectName(APINAME.toLowerCase());
|
||||
setResponseObject(response);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,6 +28,13 @@ public class CloudianSsoLoginResponse extends BaseResponse {
|
|||
@Param(description = "the sso redirect url")
|
||||
private String ssoRedirectUrl;
|
||||
|
||||
public CloudianSsoLoginResponse() {
|
||||
}
|
||||
|
||||
public CloudianSsoLoginResponse(final String responseName) {
|
||||
super.setResponseName(responseName);
|
||||
}
|
||||
|
||||
public String getSsoRedirectUrl() {
|
||||
return ssoRedirectUrl;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,16 +22,13 @@
|
|||
title: 'Cloudian Storage',
|
||||
showOnNavigation: true,
|
||||
preFilter: function(args) {
|
||||
return true;
|
||||
var pluginEnabled = false;
|
||||
$.ajax({
|
||||
url: createURL('cloudianIsEnabled'),
|
||||
async: false,
|
||||
success: function(json) {
|
||||
pluginEnabled = json.cloudianisenabledresponse.success;
|
||||
},
|
||||
error: function(data) {
|
||||
pluginEnabled = false;
|
||||
console.log(json);
|
||||
pluginEnabled = (json.cloudianisenabledresponse.success == 'true');
|
||||
}
|
||||
});
|
||||
return pluginEnabled;
|
||||
|
|
@ -43,7 +40,8 @@
|
|||
url: createURL('cloudianSsoLogin'),
|
||||
async: false,
|
||||
success: function(json) {
|
||||
ssoUrl = json.cloudianssologinresponse.url;
|
||||
console.log(json);
|
||||
ssoUrl = json.cloudianssologinresponse.cloudianssologin.url;
|
||||
//FIXME: post? maybe submit using a form?
|
||||
var cmcWindow = window.open(ssoUrl, "CMCWindow");
|
||||
cmcWindow.focus();
|
||||
|
|
|
|||
Loading…
Reference in New Issue