diff --git a/.classpath b/.classpath
index d157da0..a68c7d6 100644
--- a/.classpath
+++ b/.classpath
@@ -1,18 +1,5 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -29,5 +16,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index feecd92..8926067 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,6 +1,7 @@
-
+
+
diff --git a/pom.xml b/pom.xml
index be4db1a..fe014d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
org.gcube.distribution
gcube-bom
- 2.0.1
+ 3.0.0-SNAPSHOT
pom
import
@@ -35,7 +35,7 @@
-
+
junit
junit
@@ -51,9 +51,8 @@
org.gcube.common
storagehub-model
- [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)
-
+
org.glassfish.jersey.media
jersey-media-json-jackson
@@ -70,7 +69,6 @@
org.gcube.common
common-jaxrs-client
- [1.0.0,2.0.0-SNAPSHOT)
@@ -83,6 +81,16 @@
slf4j-api
+
+ org.gcube.common
+ common-security
+
+
+ org.gcube.common.security
+ gcube-secrets
+ test
+
+
junit
junit
diff --git a/src/main/java/org/gcube/common/storagehub/client/dsl/Util.java b/src/main/java/org/gcube/common/storagehub/client/dsl/Util.java
index 9f4ec09..04a700d 100644
--- a/src/main/java/org/gcube/common/storagehub/client/dsl/Util.java
+++ b/src/main/java/org/gcube/common/storagehub/client/dsl/Util.java
@@ -1,7 +1,7 @@
package org.gcube.common.storagehub.client.dsl;
-import org.gcube.common.scope.impl.ScopeBean;
-import org.gcube.common.scope.impl.ScopeBean.Type;
+import org.gcube.common.security.ContextBean;
+import org.gcube.common.security.ContextBean.Type;
import org.gcube.common.storagehub.client.proxies.ItemManagerClient;
import org.gcube.common.storagehub.model.exceptions.BackendGenericError;
import org.gcube.common.storagehub.model.items.AbstractFileItem;
@@ -19,7 +19,7 @@ public class Util {
}
public static String getVREGroupFromContext(String context) throws BackendGenericError{
- ScopeBean bean = new ScopeBean(context);
+ ContextBean bean = new ContextBean(context);
if (!bean.is(Type.VRE)) throw new BackendGenericError(context+ " is not a VRE context");
String entireScopeName= bean.toString().replaceAll("^/(.*)/?$", "$1").replaceAll("/", "-");
return entireScopeName;
diff --git a/src/test/java/org/gcube/data/access/fs/Items.java b/src/test/java/org/gcube/data/access/fs/Items.java
index b09ee95..b58942e 100644
--- a/src/test/java/org/gcube/data/access/fs/Items.java
+++ b/src/test/java/org/gcube/data/access/fs/Items.java
@@ -15,8 +15,8 @@ import java.util.List;
import java.util.Map.Entry;
import java.util.Properties;
-import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
-import org.gcube.common.scope.api.ScopeProvider;
+import org.gcube.common.security.providers.SecretManagerProvider;
+import org.gcube.common.security.secrets.GCubeSecret;
import org.gcube.common.storagehub.client.StreamDescriptor;
import org.gcube.common.storagehub.client.dsl.ContainerType;
import org.gcube.common.storagehub.client.dsl.FileContainer;
@@ -52,10 +52,11 @@ public class Items {
prop.load(is);
String value =(String)prop.get(tokens);
String[] splitValue = value.split(",");
- String context = splitValue[0];
String token = splitValue[1];
- SecurityTokenProvider.instance.set(token);
- ScopeProvider.instance.set(context);
+ SecretManagerProvider.instance.set(new GCubeSecret(token));
+
+ /*SecurityTokenProvider.instance.set(token);
+ ScopeProvider.instance.set(context);*/
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/src/test/java/org/gcube/data/access/fs/TestCall.java b/src/test/java/org/gcube/data/access/fs/TestCall.java
index d80200a..23aade6 100644
--- a/src/test/java/org/gcube/data/access/fs/TestCall.java
+++ b/src/test/java/org/gcube/data/access/fs/TestCall.java
@@ -5,7 +5,6 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.InputStream;
-import java.net.URI;
import java.nio.file.Files;
import java.util.Arrays;
import java.util.HashMap;
@@ -15,15 +14,8 @@ import java.util.Properties;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
-import org.gcube.common.scope.api.ScopeProvider;
+import org.gcube.common.security.providers.SecretManagerProvider;
+import org.gcube.common.security.secrets.GCubeSecret;
import org.gcube.common.storagehub.client.StreamDescriptor;
import org.gcube.common.storagehub.client.plugins.AbstractPlugin;
import org.gcube.common.storagehub.client.proxies.GroupManagerClient;
@@ -44,7 +36,6 @@ import org.gcube.common.storagehub.model.items.GCubeItem;
import org.gcube.common.storagehub.model.items.Item;
import org.gcube.common.storagehub.model.query.Queries;
import org.gcube.common.storagehub.model.query.Query;
-import org.glassfish.jersey.client.ClientProperties;
import org.junit.BeforeClass;
import org.junit.Test;
import org.slf4j.Logger;
@@ -66,10 +57,8 @@ public class TestCall {
prop.load(is);
String value =(String)prop.get(tokens);
String[] splitValue = value.split(",");
- String context = splitValue[0];
String token = splitValue[1];
- SecurityTokenProvider.instance.set(token);
- ScopeProvider.instance.set(context);
+ SecretManagerProvider.instance.set(new GCubeSecret(token));
} catch (Exception e) {
e.printStackTrace();
}