From 279bce057576d3ed450e438fbf0e04cc5d751d9b Mon Sep 17 00:00:00 2001
From: "lucio.lelii" <lucio.leliiisti.cnr.it>
Date: Mon, 24 May 2021 16:30:18 +0200
Subject: [PATCH] JWTUmaTokenProvider changed to AccessTokenProvider

---
 CHANGELOG.md                                  |  3 ++
 pom.xml                                       | 38 +------------------
 profile.xml                                   | 26 -------------
 .../library/AuthorizedTasks.java              | 10 ++---
 ...Provider.java => AccessTokenProvider.java} |  6 +--
 5 files changed, 12 insertions(+), 71 deletions(-)
 delete mode 100644 profile.xml
 rename src/main/java/org/gcube/common/authorization/library/provider/{UmaJWTProvider.java => AccessTokenProvider.java} (76%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index abff7b1..b72658e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@
 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).
 
+## [v2.4.0-SNAPSHOT] - [2021-05-21]
+
+JWTUmaTokenProvider changed to AccessTokenProvider
 
 ## [v2.3.1] - [2021-03-30]
 
diff --git a/pom.xml b/pom.xml
index 1f6d94d..1b0a6db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     	<modelVersion>4.0.0</modelVersion>
     	<groupId>org.gcube.common</groupId>
     	<artifactId>common-authorization</artifactId>
-    	<version>2.3.1-SNAPSHOT</version>
+    	<version>2.4.0</version>
     	<name>authorization service common library</name>
 
     	<parent>
@@ -38,40 +38,4 @@
     		</dependency>
     	</dependencies>
 
-    	<build>
-    		<plugins>
-    			<plugin>
-    				<groupId>org.apache.maven.plugins</groupId>
-    				<artifactId>maven-compiler-plugin</artifactId>
-    			</plugin>
-    			<plugin>
-    				<groupId>org.apache.maven.plugins</groupId>
-    				<artifactId>maven-resources-plugin</artifactId>
-    				<version>2.5</version>
-    				<executions>
-    					<execution>
-    						<id>copy-profile</id>
-    						<phase>install</phase>
-    						<goals>
-    							<goal>copy-resources</goal>
-    						</goals>
-    						<configuration>
-    							<outputDirectory>target</outputDirectory>
-    							<resources>
-    								<resource>
-    									<directory>.</directory>
-    									<filtering>true</filtering>
-    									<includes>
-    										<include>profile.xml</include>
-    									</includes>
-    								</resource>
-    							</resources>
-    						</configuration>
-    					</execution>
-    				</executions>
-    			</plugin>
-    			
-    		</plugins>
-    	</build>
-
     </project>
diff --git a/profile.xml b/profile.xml
deleted file mode 100644
index 91c49e4..0000000
--- a/profile.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<ID />
-	<Type>Service</Type>
-	<Profile>
-		<Description>${description}</Description>
-		<Class>Common</Class>
-		<Name>${artifactId}</Name>
-		<Version>1.0.0</Version>
-		<Packages>
-			<Software>
-				<Name>${artifactId}</Name>
-				<Version>${version}</Version>
-				<MavenCoordinates>
-					<groupId>${groupId}</groupId>
-					<artifactId>${artifactId}</artifactId>
-					<version>${version}</version>
-				</MavenCoordinates>
-				<Files>
-					<File>${build.finalName}.jar</File>
-				</Files>
-			</Software>
-		</Packages>
-	</Profile>
-</Resource>
-
diff --git a/src/main/java/org/gcube/common/authorization/library/AuthorizedTasks.java b/src/main/java/org/gcube/common/authorization/library/AuthorizedTasks.java
index ad6f1bf..ed7e133 100644
--- a/src/main/java/org/gcube/common/authorization/library/AuthorizedTasks.java
+++ b/src/main/java/org/gcube/common/authorization/library/AuthorizedTasks.java
@@ -2,9 +2,9 @@ package org.gcube.common.authorization.library;
 
 import java.util.concurrent.Callable;
 
+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.authorization.library.provider.UmaJWTProvider;
 import org.gcube.common.authorization.library.utils.Caller;
 import org.gcube.common.scope.api.ScopeProvider;
 import org.slf4j.Logger;
@@ -29,7 +29,7 @@ public class AuthorizedTasks {
 		
 		final String scope = ScopeProvider.instance.get();
 		
-		final String umaToken = UmaJWTProvider.instance.get();
+		final String accessToken = AccessTokenProvider.instance.get();
 		
 		return new Callable<V>() {
 			@Override
@@ -39,7 +39,7 @@ public class AuthorizedTasks {
 				AuthorizationProvider.instance.set(userCall);
 				SecurityTokenProvider.instance.set(token);
 				ScopeProvider.instance.set(scope);
-				UmaJWTProvider.instance.set(umaToken);
+				AccessTokenProvider.instance.set(accessToken);
 				
 				try {
 					logger.info("setting on authorized task scope {} and token {}", scope, token);
@@ -69,7 +69,7 @@ public class AuthorizedTasks {
 		
 		final String scope = ScopeProvider.instance.get();
 		
-		final String umaToken = UmaJWTProvider.instance.get();
+		final String accessToken = AccessTokenProvider.instance.get();
 		
 		return new Runnable() {
 			@Override
@@ -77,7 +77,7 @@ public class AuthorizedTasks {
 				AuthorizationProvider.instance.set(userCall);
 				SecurityTokenProvider.instance.set(token);
 				ScopeProvider.instance.set(scope);
-				UmaJWTProvider.instance.set(umaToken);
+				AccessTokenProvider.instance.set(accessToken);
 				
 				try {
 					logger.info("setting on authorized task scope {} and token {}", scope, token);
diff --git a/src/main/java/org/gcube/common/authorization/library/provider/UmaJWTProvider.java b/src/main/java/org/gcube/common/authorization/library/provider/AccessTokenProvider.java
similarity index 76%
rename from src/main/java/org/gcube/common/authorization/library/provider/UmaJWTProvider.java
rename to src/main/java/org/gcube/common/authorization/library/provider/AccessTokenProvider.java
index e68c822..de49cd1 100644
--- a/src/main/java/org/gcube/common/authorization/library/provider/UmaJWTProvider.java
+++ b/src/main/java/org/gcube/common/authorization/library/provider/AccessTokenProvider.java
@@ -1,8 +1,8 @@
 package org.gcube.common.authorization.library.provider;
 
-public class UmaJWTProvider {
+public class AccessTokenProvider {
 
-    public static UmaJWTProvider instance = new UmaJWTProvider();
+    public static AccessTokenProvider instance = new AccessTokenProvider();
 
     private static final InheritableThreadLocal<String> threadToken = new InheritableThreadLocal<String>() {
 
@@ -13,7 +13,7 @@ public class UmaJWTProvider {
 
     };
 
-    private UmaJWTProvider() {
+    private AccessTokenProvider() {
     }
 
     public String get() {