From 08e598fc3412a21ede13b832d14319c39e52b13a Mon Sep 17 00:00:00 2001
From: "lucio.lelii" <lucio.leliiisti.cnr.it>
Date: Tue, 5 Oct 2021 11:40:22 +0200
Subject: [PATCH] moved to the new Authorization system

---
 pom.xml                                       | 71 +------------------
 .../analysis/rconnector/ConfigFileWriter.java |  3 +-
 .../rconnector/DisconnectResource.java        |  2 -
 .../data/analysis/rconnector/Resource.java    |  5 +-
 4 files changed, 7 insertions(+), 74 deletions(-)

diff --git a/pom.xml b/pom.xml
index f21b230..d381cfe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
 	
 	<groupId>org.gcube.data.analysis</groupId>
 	<artifactId>r-connector</artifactId>
-	<version>2.1.6-SNAPSHOT</version>
+	<version>3.0.0</version>
 	<name>RConnector</name>
 	<description>makes R available in the infrastructure</description>
 
@@ -29,8 +29,8 @@
 		<dependencies>
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
-				<artifactId>maven-smartgears-bom</artifactId>
-				<version>LATEST</version>
+				<artifactId>gcube-smartgears-bom</artifactId>
+				<version>2.0.0</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -81,12 +81,10 @@
 		<dependency>
 			<groupId>javax.ws.rs</groupId>
 			<artifactId>javax.ws.rs-api</artifactId>
-			<version>2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jersey.containers</groupId>
 			<artifactId>jersey-container-servlet</artifactId>
-			<version>2.13</version>
 		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jersey.containers.glassfish</groupId>
@@ -114,7 +112,6 @@
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
-			<version>1.0.13</version>
 		</dependency>
 
 		<!-- weld -->
@@ -144,73 +141,11 @@
 		<dependency>
 			<groupId>org.glassfish.jersey.test-framework.providers</groupId>
 			<artifactId>jersey-test-framework-provider-simple</artifactId>
-			<version>2.13</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
 
 	<build>
 		<finalName>${artifactId}</finalName>
-		<plugins>
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.3.2</version>
-				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-war-plugin</artifactId>
-				<version>2.4</version>
-				<configuration>
-					<warName>r-connector</warName>
-					<failOnMissingWebXml>false</failOnMissingWebXml>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>2.6</version>
-				<executions>
-					<execution>
-						<id>copy-profile</id>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<phase>process-resources</phase>
-						<configuration>
-							<outputDirectory>${webappDirectory}</outputDirectory>
-							<resources>
-								<resource>
-									<directory>${distroDirectory}</directory>
-									<filtering>true</filtering>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<version>2.2</version>
-				<configuration>
-					<descriptors>
-						<descriptor>${distroDirectory}/descriptor.xml</descriptor>
-					</descriptors>
-				</configuration>
-				<executions>
-					<execution>
-						<id>servicearchive</id>
-						<phase>install</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
 	</build>
 </project>
\ No newline at end of file
diff --git a/src/main/java/org/gcube/data/analysis/rconnector/ConfigFileWriter.java b/src/main/java/org/gcube/data/analysis/rconnector/ConfigFileWriter.java
index bbc040a..bf662bf 100644
--- a/src/main/java/org/gcube/data/analysis/rconnector/ConfigFileWriter.java
+++ b/src/main/java/org/gcube/data/analysis/rconnector/ConfigFileWriter.java
@@ -5,7 +5,6 @@ import java.io.FileWriter;
 
 import javax.inject.Singleton;
 
-import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
 import org.gcube.common.scope.api.ScopeProvider;
 
 import lombok.extern.slf4j.Slf4j;
@@ -23,7 +22,7 @@ public class ConfigFileWriter {
 		if (!userDir.exists())
 			userDir.mkdir();
 		File configFile= new File(userDir, fileName);
-		Utils.executeCommandLine(scriptToExecute,login, SecurityTokenProvider.instance.get(), ScopeProvider.instance.get());
+		Utils.executeCommandLine(scriptToExecute,login, info.getToken(), ScopeProvider.instance.get());
 		return  writeFile(info, configFile);
 	}
 
diff --git a/src/main/java/org/gcube/data/analysis/rconnector/DisconnectResource.java b/src/main/java/org/gcube/data/analysis/rconnector/DisconnectResource.java
index 3d7791b..3470cd7 100644
--- a/src/main/java/org/gcube/data/analysis/rconnector/DisconnectResource.java
+++ b/src/main/java/org/gcube/data/analysis/rconnector/DisconnectResource.java
@@ -11,8 +11,6 @@ import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-import org.gcube.common.authorization.library.provider.AuthorizationProvider;
-
 import lombok.extern.slf4j.Slf4j;
 
 @Path("disconnect")
diff --git a/src/main/java/org/gcube/data/analysis/rconnector/Resource.java b/src/main/java/org/gcube/data/analysis/rconnector/Resource.java
index 368ebe1..66f864b 100644
--- a/src/main/java/org/gcube/data/analysis/rconnector/Resource.java
+++ b/src/main/java/org/gcube/data/analysis/rconnector/Resource.java
@@ -20,8 +20,8 @@ import javax.ws.rs.core.NewCookie;
 import javax.ws.rs.core.Response;
 import javax.xml.bind.DatatypeConverter;
 
+import org.gcube.common.authorization.library.provider.AccessTokenProvider;
 import org.gcube.common.authorization.library.provider.AuthorizationProvider;
-import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
 import org.gcube.common.scope.api.ScopeProvider;
 
 import lombok.extern.slf4j.Slf4j;
@@ -39,6 +39,7 @@ public class Resource {
 	@Context ServletContext context;
 
 
+	@Deprecated
 	@Path("/{trId}")
 	@GET
 	public Response connect(@PathParam("trId") Long tabularResourceId) {
@@ -74,7 +75,7 @@ public class Resource {
 		if (login == null ) return Response.serverError().build();
 		Info info = new Info();
 		info.setUsername(login);
-		info.setToken(SecurityTokenProvider.instance.get());
+		info.setToken(AccessTokenProvider.instance.get());
 		if (!writer.write(info, login, usersHome, filename, scriptToExecute)) return Response.serverError().build();
 
 		return createResponse(AuthorizationProvider.instance.get().getClient().getId());