cloudian: add logging, don't update for group 0 users

rohityadavcloud · rohityadavcloud · commit 2183a4fd682f · 2017-10-04T12:18:45.000+05:30
Signed-off-by: Rohit Yadav &lt;rohit.yadav@shapeblue.com&gt;
diff --git a/plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/CloudianConnectorImpl.java b/plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/CloudianConnectorImpl.java
@@ -220,10 +220,12 @@ public String generateSsoUrl() {
             if (addedSsoUser == null || !addedSsoUser.getActive()) {
                 throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Aborting Cloudian SSO, failed to find mapped Cloudian user, please fix integration issues.");
             }
-        } else {
+        } else if (!group.equals("0")) {
             updateUserAccount(caller, domain, ssoUser);
         }
 
+        LOG.debug(String.format("Returning generated Cloudian SSO URL for user id=%s, group id=%s", user, group));
+
         return CloudianUtils.generateSSOUrl(getCmcUrl(), user, group, CloudianSsoKey.value());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -220,10 +220,12 @@ public String generateSsoUrl() {`
`220`	`220`	`if (addedSsoUser == null \|\| !addedSsoUser.getActive()) {`
`221`	`221`	`throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Aborting Cloudian SSO, failed to find mapped Cloudian user, please fix integration issues.");`
`222`	`222`	`}`
`223`		`- } else {`
	`223`	`+ } else if (!group.equals("0")) {`
`224`	`224`	`updateUserAccount(caller, domain, ssoUser);`
`225`	`225`	`}`
`226`	`226`
	`227`	`+ LOG.debug(String.format("Returning generated Cloudian SSO URL for user id=%s, group id=%s", user, group));`
	`228`	`+`
`227`	`229`	`return CloudianUtils.generateSSOUrl(getCmcUrl(), user, group, CloudianSsoKey.value());`
`228`	`230`	`}`
`229`	`231`