From a7f2dde3e680471cf29fed7bd5d3ac5bcf05b208 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Wed, 17 Mar 2021 11:28:25 +0100 Subject: [PATCH] bug fixing scopeName to fullScope --- CHANGELOG.md | 3 ++- .../portlets/widgets/wsthreddssync/server/BeanConverter.java | 2 +- .../widgets/wsthreddssync/server/SyncronizeWithThredds.java | 5 +++-- .../gcube/portlets/widgets/wsthreddssync/server/WsUtil.java | 3 ++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b74765..2f3f993 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,10 +3,11 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [v1.3.0-SNAPSHOT] - 2021-03-03 +## [v1.3.0-SNAPSHOT] - 2021-03-17 [#20847] Support the roles of THREDDS Admin and THREDDS Publisher + ## [v1.2.0] - 2020-07-21 [#19676] Migrated to git/jenkins diff --git a/src/main/java/org/gcube/portlets/widgets/wsthreddssync/server/BeanConverter.java b/src/main/java/org/gcube/portlets/widgets/wsthreddssync/server/BeanConverter.java index 008e8cf..5fa7a67 100644 --- a/src/main/java/org/gcube/portlets/widgets/wsthreddssync/server/BeanConverter.java +++ b/src/main/java/org/gcube/portlets/widgets/wsthreddssync/server/BeanConverter.java @@ -54,7 +54,7 @@ public class BeanConverter { ws.setSelectedScope(selectedScope); logger.debug("Resolved SCOPE: " + selectedScope + " from token"); } catch (Exception e) { - // TODO: handle exception + logger.error("I cannot resolve the scope for the token: "+t.getConfiguration().getTargetToken()); } } diff --git a/src/main/java/org/gcube/portlets/widgets/wsthreddssync/server/SyncronizeWithThredds.java b/src/main/java/org/gcube/portlets/widgets/wsthreddssync/server/SyncronizeWithThredds.java index 36bfc5f..c6bd2be 100644 --- a/src/main/java/org/gcube/portlets/widgets/wsthreddssync/server/SyncronizeWithThredds.java +++ b/src/main/java/org/gcube/portlets/widgets/wsthreddssync/server/SyncronizeWithThredds.java @@ -90,8 +90,9 @@ public class SyncronizeWithThredds { try{ if(firstSync) { - if(thConfig==null) - throw new Exception("A valid folder configuration must be provided to perforom synchronization"); + if(thConfig==null) { + throw new Exception("A valid folder configuration must be provided to perform the synchronization"); + } logger.info("First sync setting synchronized folder configuration: "+thConfig); workspaceThreddsSynchronize.setSynchronizedFolder(thConfig, folderId); diff --git a/src/main/java/org/gcube/portlets/widgets/wsthreddssync/server/WsUtil.java b/src/main/java/org/gcube/portlets/widgets/wsthreddssync/server/WsUtil.java index 64148d8..b722156 100644 --- a/src/main/java/org/gcube/portlets/widgets/wsthreddssync/server/WsUtil.java +++ b/src/main/java/org/gcube/portlets/widgets/wsthreddssync/server/WsUtil.java @@ -133,7 +133,8 @@ public class WsUtil { for (GCubeGroup gCubeGroup : listOfGroups) { GatewayRolesThredds threddsRole = getThreddsRoleFor(user, gCubeGroup); if(threddsRole != null) { - mapRoleByGroupSingleVre.put(gCubeGroup.getGroupName(), threddsRole); + String toFullScope = groupManager.getInfrastructureScope(gCubeGroup.getGroupId()); + mapRoleByGroupSingleVre.put(toFullScope, threddsRole); } }