diff --git a/distro/changelog.xml b/distro/changelog.xml index 7c0c53e..b9c6a57 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -7,6 +7,8 @@ Added update support for Item #11516 Changed caching mechanism from ehcache API to JSR-107. Ehcache is still used as runtime library. Solved random NullPointer Exception on catalogue-ws related to old caching mechanism #11466 + Fixed normalization of the organization name #12506 + Added the possibility to deny social post on catalogue-ws #12514 diff --git a/src/main/java/org/gcube/datacatalogue/catalogue/utils/PackageCreatePostActions.java b/src/main/java/org/gcube/datacatalogue/catalogue/utils/PackageCreatePostActions.java index b2c5787..29656c8 100644 --- a/src/main/java/org/gcube/datacatalogue/catalogue/utils/PackageCreatePostActions.java +++ b/src/main/java/org/gcube/datacatalogue/catalogue/utils/PackageCreatePostActions.java @@ -46,6 +46,13 @@ public class PackageCreatePostActions extends Thread { try { DataCatalogue dataCatalogue = CatalogueUtils.getCatalogue(); + + if(!dataCatalogue.isSocialPostEnabled()){ + logger.info("Social Post are disabled in the context {}", ContextUtils.getContext()); + return; + } + + String apiKey = CatalogueUtils.getApiKey(); dataCatalogue.setSearchableField(packageId, true); diff --git a/src/main/java/org/gcube/datacatalogue/catalogue/utils/Validator.java b/src/main/java/org/gcube/datacatalogue/catalogue/utils/Validator.java index f6e3e1f..f6ffb75 100644 --- a/src/main/java/org/gcube/datacatalogue/catalogue/utils/Validator.java +++ b/src/main/java/org/gcube/datacatalogue/catalogue/utils/Validator.java @@ -117,8 +117,13 @@ public class Validator { boolean isVREToken = scopeBean.is(Type.VRE); String ownerOrg = (String) dataset.get(Constants.OWNER_ORG_KEY); + /* String organization = isVREToken ? ownerOrgFromScope.toLowerCase().replace(" ", "_").replace("-", "_") : ownerOrg != null ? ownerOrg.toLowerCase().replace(" ", "_").replace("-", "_") : null; + */ + + String organization = isVREToken ? ownerOrgFromScope.toLowerCase().replace(" ", "_") + : ownerOrg != null ? ownerOrg : null; if(organization != null) { if(!ContextUtils.isApplication()) {