.gitignore

@@ -2,5 +2,3 @@ target
 .classpath
 .project
 .settings
-/bin/
-/.DS_Store

CHANGELOG.md

@@ -2,9 +2,6 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 # Changelog for Smart Executor Client
 
-## [v3.1.0]
-
-- Ported service to authorization-utils [#22871]
 
 ## [v3.0.0] 
 

pom.xml

@@ -10,7 +10,7 @@
 
 	<groupId>org.gcube.vremanagement</groupId>
 	<artifactId>smart-executor-client</artifactId>
-	<version>3.1.0</version>
+	<version>3.0.0</version>
 	<name>Smart Executor Client</name>
 	<description>Smart Executor Client is a library designed to interact with Smart Executor exposed REST API</description>
 	
@@ -30,7 +30,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>gcube-bom</artifactId>
-				<version>2.1.0</version>
+				<version>2.0.1</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -83,12 +83,6 @@
 			<artifactId>logback-classic</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.gcube.common</groupId>
-			<artifactId>authorization-utils</artifactId>
-			<version>[2.0.0, 3.0.0-SNAPSHOT)</version>
-			<scope>test</scope>
-		</dependency>
 <!-- 		<dependency> -->
 <!-- 			<groupId>org.gcube.vremanagement</groupId> -->
 <!-- 			<artifactId>hello-world-se-plugin</artifactId> -->

src/test/java/org/gcube/vremanagement/executor/client/ContextTest.java

@@ -7,24 +7,31 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
 
-import org.gcube.common.authorization.utils.manager.SecretManager;
+import org.gcube.common.authorization.client.Constants;
-import org.gcube.common.authorization.utils.manager.SecretManagerProvider;
+import org.gcube.common.authorization.client.exceptions.ObjectNotFound;
-import org.gcube.common.authorization.utils.secret.Secret;
+import org.gcube.common.authorization.library.AuthorizationEntry;
-import org.gcube.common.authorization.utils.secret.SecretUtility;
+import org.gcube.common.authorization.library.provider.AuthorizationProvider;
+import org.gcube.common.authorization.library.provider.ClientInfo;
+import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
+import org.gcube.common.authorization.library.utils.Caller;
+import org.gcube.common.scope.api.ScopeProvider;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
+ *
  */
 public class ContextTest {
 	
+	private static final Logger logger = LoggerFactory.getLogger(ContextTest.class);
+	
 	protected static Properties properties;
 	protected static final String PROPERTIES_FILENAME = "token.properties";
 	
-	public static final String ROOT;
+	public static final String DEFAULT_TEST_SCOPE_NAME;
-	public static final String VO;
-	public static final String VRE;
 	
 	static {
 		properties = new Properties();
@@ -37,50 +44,42 @@ public class ContextTest {
 			throw new RuntimeException(e);
 		}
 		
-		ROOT = "/gcube";
+		//DEFAULT_TEST_SCOPE_NAME = "/pred4s/preprod/preVRE";
-//		VO = ROOT + "/devsec";
+		DEFAULT_TEST_SCOPE_NAME = "/gcube/devNext/NextNext";
-//		VRE = VO + "/devVRE";
-		VO = ROOT + "/devNext";
-		VRE = VO + "/NextNext";
-		
 	}
 	
-	public static void set(Secret secret) throws Exception {
+	public static String getCurrentScope(String token) throws ObjectNotFound, Exception {
-		SecretManagerProvider.instance.reset();
+		AuthorizationEntry authorizationEntry = Constants.authorizationService().get(token);
-		SecretManager secretManager = new SecretManager(); 
+		String context = authorizationEntry.getContext();
-		SecretManagerProvider.instance.set(secretManager);
+		logger.info("Context of token {} is {}", token, context);
-		secretManager.addSecret(secret);
+		return context;
-		secretManager.set();
 	}
 	
-	public static void setContext(String token) throws Exception {
+	public static void setContextByName(String fullContextName) throws ObjectNotFound, Exception {
-		Secret secret = getSecret(token);
-		set(secret);
-	}
-
-	public static void setContextByName(String fullContextName) throws Exception {
-		Secret secret = getSecretByContextName(fullContextName);
-		set(secret);
-	}
-	
-	private static Secret getSecret(String token) throws Exception {
-		Secret secret = SecretUtility.getSecretByTokenString(token);
-		return secret;
-	}
-	
-	private static Secret getSecretByContextName(String fullContextName) throws Exception {
 		String token = ContextTest.properties.getProperty(fullContextName);
-		return getSecret(token);
+		setContext(token);
+	}
+	
+	public static void setContext(String token) throws ObjectNotFound, Exception {
+		SecurityTokenProvider.instance.set(token);
+		AuthorizationEntry authorizationEntry = Constants.authorizationService().get(token);
+		ClientInfo clientInfo = authorizationEntry.getClientInfo();
+		logger.debug("User : {} - Type : {}", clientInfo.getId(), clientInfo.getType().name());
+		String qualifier = authorizationEntry.getQualifier();
+		Caller caller = new Caller(clientInfo, qualifier);
+		AuthorizationProvider.instance.set(caller);
+		ScopeProvider.instance.set(getCurrentScope(token));
 	}
 	
 	@BeforeClass
 	public static void beforeClass() throws Exception {
-		setContextByName(ROOT);
+		setContextByName(DEFAULT_TEST_SCOPE_NAME);
 	}
 	
 	@AfterClass
 	public static void afterClass() throws Exception {
-		SecretManagerProvider.instance.reset();
+		SecurityTokenProvider.instance.reset();
+		ScopeProvider.instance.reset();
 	}
 	
 }