bug fixing scopeName to fullScope
This commit is contained in:
parent
660d869ab5
commit
a7f2dde3e6
|
@ -3,10 +3,11 @@
|
||||||
All notable changes to this project will be documented in this file.
|
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).
|
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
|
[#20847] Support the roles of THREDDS Admin and THREDDS Publisher
|
||||||
|
|
||||||
|
|
||||||
## [v1.2.0] - 2020-07-21
|
## [v1.2.0] - 2020-07-21
|
||||||
|
|
||||||
[#19676] Migrated to git/jenkins
|
[#19676] Migrated to git/jenkins
|
||||||
|
|
|
@ -54,7 +54,7 @@ public class BeanConverter {
|
||||||
ws.setSelectedScope(selectedScope);
|
ws.setSelectedScope(selectedScope);
|
||||||
logger.debug("Resolved SCOPE: " + selectedScope + " from token");
|
logger.debug("Resolved SCOPE: " + selectedScope + " from token");
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
// TODO: handle exception
|
logger.error("I cannot resolve the scope for the token: "+t.getConfiguration().getTargetToken());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -90,8 +90,9 @@ public class SyncronizeWithThredds {
|
||||||
try{
|
try{
|
||||||
|
|
||||||
if(firstSync) {
|
if(firstSync) {
|
||||||
if(thConfig==null)
|
if(thConfig==null) {
|
||||||
throw new Exception("A valid folder configuration must be provided to perforom synchronization");
|
throw new Exception("A valid folder configuration must be provided to perform the synchronization");
|
||||||
|
}
|
||||||
|
|
||||||
logger.info("First sync setting synchronized folder configuration: "+thConfig);
|
logger.info("First sync setting synchronized folder configuration: "+thConfig);
|
||||||
workspaceThreddsSynchronize.setSynchronizedFolder(thConfig, folderId);
|
workspaceThreddsSynchronize.setSynchronizedFolder(thConfig, folderId);
|
||||||
|
|
|
@ -133,7 +133,8 @@ public class WsUtil {
|
||||||
for (GCubeGroup gCubeGroup : listOfGroups) {
|
for (GCubeGroup gCubeGroup : listOfGroups) {
|
||||||
GatewayRolesThredds threddsRole = getThreddsRoleFor(user, gCubeGroup);
|
GatewayRolesThredds threddsRole = getThreddsRoleFor(user, gCubeGroup);
|
||||||
if(threddsRole != null) {
|
if(threddsRole != null) {
|
||||||
mapRoleByGroupSingleVre.put(gCubeGroup.getGroupName(), threddsRole);
|
String toFullScope = groupManager.getInfrastructureScope(gCubeGroup.getGroupId());
|
||||||
|
mapRoleByGroupSingleVre.put(toFullScope, threddsRole);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue