diff --git a/src/main/java/org/gcube/gcat/persistence/ckan/CKANPackage.java b/src/main/java/org/gcube/gcat/persistence/ckan/CKANPackage.java index ded7072..82d6e3d 100644 --- a/src/main/java/org/gcube/gcat/persistence/ckan/CKANPackage.java +++ b/src/main/java/org/gcube/gcat/persistence/ckan/CKANPackage.java @@ -139,14 +139,10 @@ public class CKANPackage extends CKAN implements Moderated { PURGE = ITEM_PURGE; managedResources = new ArrayList(); - ckanUser = CKANUserCache.getCurrrentCKANUser(); - configuration = CatalogueConfigurationFactory.getInstance(); - for(String supportedOrganization : configuration.getSupportedOrganizations()) { - ckanUser.addUserToOrganization(supportedOrganization); - } - + ckanUser = CKANUserCache.getCurrrentCKANUser(); + } protected CKANOrganization checkGotOrganization(String gotOrganization) throws ForbiddenException { diff --git a/src/main/java/org/gcube/gcat/persistence/ckan/CKANPackageTrash.java b/src/main/java/org/gcube/gcat/persistence/ckan/CKANPackageTrash.java index dc3de82..13b4d0e 100644 --- a/src/main/java/org/gcube/gcat/persistence/ckan/CKANPackageTrash.java +++ b/src/main/java/org/gcube/gcat/persistence/ckan/CKANPackageTrash.java @@ -54,15 +54,9 @@ public class CKANPackageTrash { public CKANPackageTrash() { mapper = new ObjectMapper(); - ckanUser = CKANUserCache.getCurrrentCKANUser(); configuration = CatalogueConfigurationFactory.getInstance(); - supportedOrganizations = configuration.getSupportedOrganizations(); - for(String supportedOrganization : supportedOrganizations) { - ckanUser.addUserToOrganization(supportedOrganization); - } - ownOnly = true; } diff --git a/src/main/java/org/gcube/gcat/persistence/ckan/CKANUser.java b/src/main/java/org/gcube/gcat/persistence/ckan/CKANUser.java index 4c3efe9..d0379a4 100644 --- a/src/main/java/org/gcube/gcat/persistence/ckan/CKANUser.java +++ b/src/main/java/org/gcube/gcat/persistence/ckan/CKANUser.java @@ -9,8 +9,10 @@ import javax.ws.rs.core.Response.Status; import org.gcube.com.fasterxml.jackson.databind.node.ObjectNode; import org.gcube.common.authorization.utils.manager.SecretManagerProvider; import org.gcube.common.authorization.utils.user.User; +import org.gcube.gcat.api.configuration.CatalogueConfiguration; import org.gcube.gcat.api.moderation.Moderated; import org.gcube.gcat.api.roles.Role; +import org.gcube.gcat.configuration.CatalogueConfigurationFactory; import org.gcube.gcat.utils.RandomString; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -174,7 +176,10 @@ public class CKANUser extends CKAN { } } try { - addUserToOrganization(); + CatalogueConfiguration configuration = CatalogueConfigurationFactory.getInstance(); + for(String supportedOrganization : configuration.getSupportedOrganizations()) { + addUserToOrganization(supportedOrganization); + } }catch (Exception e) { // The organization could not exists and this is fine in some cases like organization create or // for listing items at VO level. The organization corresponding to the VO could not exists.