gCubeSystem
/
gcat
16
0
Fork 0
Code Issues Pull Requests Releases 13 Wiki Activity

Fixed add to organization

This commit is contained in:
Luca Frosini 2022-04-21 17:12:41 +02:00
parent 7db232b970
commit c227d5069d
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/gcube/gcat/persistence/ckan/CKANPackage.java
View File

@ -139,14 +139,10 @@ public class CKANPackage extends CKAN implements Moderated {
PURGE = ITEM_PURGE; PURGE = ITEM_PURGE;
managedResources = new ArrayList<CKANResource>(); managedResources = new ArrayList<CKANResource>();
ckanUser = CKANUserCache.getCurrrentCKANUser();
configuration = CatalogueConfigurationFactory.getInstance(); configuration = CatalogueConfigurationFactory.getInstance();
for(String supportedOrganization : configuration.getSupportedOrganizations()) { ckanUser = CKANUserCache.getCurrrentCKANUser();
ckanUser.addUserToOrganization(supportedOrganization);
}
} }
protected CKANOrganization checkGotOrganization(String gotOrganization) throws ForbiddenException { protected CKANOrganization checkGotOrganization(String gotOrganization) throws ForbiddenException {

6
src/main/java/org/gcube/gcat/persistence/ckan/CKANPackageTrash.java
View File

@ -54,15 +54,9 @@ public class CKANPackageTrash {
public CKANPackageTrash() { public CKANPackageTrash() {
mapper = new ObjectMapper(); mapper = new ObjectMapper();
ckanUser = CKANUserCache.getCurrrentCKANUser(); ckanUser = CKANUserCache.getCurrrentCKANUser();
configuration = CatalogueConfigurationFactory.getInstance(); configuration = CatalogueConfigurationFactory.getInstance();
supportedOrganizations = configuration.getSupportedOrganizations(); supportedOrganizations = configuration.getSupportedOrganizations();
for(String supportedOrganization : supportedOrganizations) {
ckanUser.addUserToOrganization(supportedOrganization);
}
ownOnly = true; ownOnly = true;
} }

7
src/main/java/org/gcube/gcat/persistence/ckan/CKANUser.java
View File

@ -9,8 +9,10 @@ import javax.ws.rs.core.Response.Status;
import org.gcube.com.fasterxml.jackson.databind.node.ObjectNode; import org.gcube.com.fasterxml.jackson.databind.node.ObjectNode;
import org.gcube.common.authorization.utils.manager.SecretManagerProvider; import org.gcube.common.authorization.utils.manager.SecretManagerProvider;
import org.gcube.common.authorization.utils.user.User; 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.moderation.Moderated;
import org.gcube.gcat.api.roles.Role; import org.gcube.gcat.api.roles.Role;
import org.gcube.gcat.configuration.CatalogueConfigurationFactory;
import org.gcube.gcat.utils.RandomString; import org.gcube.gcat.utils.RandomString;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -174,7 +176,10 @@ public class CKANUser extends CKAN {
} }
} }
try { try {
addUserToOrganization(); CatalogueConfiguration configuration = CatalogueConfigurationFactory.getInstance();
for(String supportedOrganization : configuration.getSupportedOrganizations()) {
addUserToOrganization(supportedOrganization);
}
}catch (Exception e) { }catch (Exception e) {
// The organization could not exists and this is fine in some cases like organization create or // 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. // for listing items at VO level. The organization corresponding to the VO could not exists.