diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/CKanUtils.java b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/CKanUtils.java index 9f73885..35ffb5c 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/CKanUtils.java +++ b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/CKanUtils.java @@ -230,4 +230,5 @@ public interface CKanUtils { * @return list of CkanDatasetRelationship objects or null if an error occurs */ List getRelationshipDatasets(String datasetIdSubject, String datasetIdObject, String apiKey); + } diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/CKanUtilsImpl.java b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/CKanUtilsImpl.java index 5b4d0d4..aeba9f7 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/CKanUtilsImpl.java +++ b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/CKanUtilsImpl.java @@ -164,10 +164,10 @@ public class CKanUtilsImpl implements CKanUtils{ ResultSet rs = preparedStatement.executeQuery(); while (rs.next()) { apiToReturn = rs.getString("apikey"); + logger.debug("Api key retrieved for user " + ckanUsername); break; } - - logger.debug("Api key retrieved for user " + ckanUsername); + }catch(Exception e){ logger.error("Unable to retrieve key for user " + ckanUsername, e); }finally{ @@ -712,9 +712,9 @@ public class CKanUtilsImpl implements CKanUtils{ !setPublic, // swap to private res.getOrganization().getId(), res.getId(), - apiKey); + CKAN_TOKEN_SYS); // use sysadmin api key to be sure it will be set - logger.debug("Is visibility set to " + (setPublic ? "public" : "private") + "? " + visibilitySet); + logger.debug("Was visibility set to " + (setPublic ? "public" : "private") + "? " + visibilitySet); return res.getId(); } diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/models/CKanUserWrapper.java b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/models/CKanUserWrapper.java index 8e23343..d89a103 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/models/CKanUserWrapper.java +++ b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/models/CKanUserWrapper.java @@ -125,7 +125,7 @@ public class CKanUserWrapper implements Serializable{ @Override public String toString() { - return "CKanUserExtended [id=" + id + ", name=" + name + ", apiKey=" + apiKey + return "CKanUserExtended [id=" + id + ", name=" + name + ", apiKey=" + apiKey.substring(0, 5) + "****************" + ", creationTimestamp=" + creationTimestamp + ", about=" + about + ", openId=" + openId + ", fullName=" + fullName + ", email=" + email + ", isAdmin=" + isAdmin + "]"; diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/utils/UtilMethods.java b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/utils/UtilMethods.java index e9b5cf5..aad1154 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/utils/UtilMethods.java +++ b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/utils/UtilMethods.java @@ -66,5 +66,16 @@ public class UtilMethods { return false; } } + + /** + * Given the orgName, returns "orgName_admin" string. + * @return + */ + public static String getUserAdminFromOrganizationName(String orgName){ + + logger.debug("Going to return " + orgName + "_admin"); + return orgName + "_admin"; + + } }