diff --git a/plugins/connectors/cloudian/src/com/cloudian/cloudstack/CloudianConnectorImpl.java b/plugins/connectors/cloudian/src/com/cloudian/cloudstack/CloudianConnectorImpl.java index 59e056cfca1..fc949c46220 100644 --- a/plugins/connectors/cloudian/src/com/cloudian/cloudstack/CloudianConnectorImpl.java +++ b/plugins/connectors/cloudian/src/com/cloudian/cloudstack/CloudianConnectorImpl.java @@ -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 diff --git a/plugins/connectors/cloudian/src/com/cloudian/cloudstack/api/CloudianIsEnabledCmd.java b/plugins/connectors/cloudian/src/com/cloudian/cloudstack/api/CloudianIsEnabledCmd.java index 0f2b63731dd..48ddceabdf1 100644 --- a/plugins/connectors/cloudian/src/com/cloudian/cloudstack/api/CloudianIsEnabledCmd.java +++ b/plugins/connectors/cloudian/src/com/cloudian/cloudstack/api/CloudianIsEnabledCmd.java @@ -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); } diff --git a/plugins/connectors/cloudian/src/com/cloudian/cloudstack/api/CloudianSsoLoginCmd.java b/plugins/connectors/cloudian/src/com/cloudian/cloudstack/api/CloudianSsoLoginCmd.java index d1c9f56d9d7..af330ca6bcf 100644 --- a/plugins/connectors/cloudian/src/com/cloudian/cloudstack/api/CloudianSsoLoginCmd.java +++ b/plugins/connectors/cloudian/src/com/cloudian/cloudstack/api/CloudianSsoLoginCmd.java @@ -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); } } diff --git a/plugins/connectors/cloudian/src/com/cloudian/cloudstack/response/CloudianSsoLoginResponse.java b/plugins/connectors/cloudian/src/com/cloudian/cloudstack/response/CloudianSsoLoginResponse.java index 03f220dffef..b407b47b708 100644 --- a/plugins/connectors/cloudian/src/com/cloudian/cloudstack/response/CloudianSsoLoginResponse.java +++ b/plugins/connectors/cloudian/src/com/cloudian/cloudstack/response/CloudianSsoLoginResponse.java @@ -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; } diff --git a/ui/plugins/cloudian/cloudian.js b/ui/plugins/cloudian/cloudian.js index 1cce010577e..64fde459620 100644 --- a/ui/plugins/cloudian/cloudian.js +++ b/ui/plugins/cloudian/cloudian.js @@ -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();