From 32452f3c6a4b727bc11f0c4a19197d98f838a251 Mon Sep 17 00:00:00 2001
From: "lucio.lelii" <lucio.leliiisti.cnr.it>
Date: Mon, 24 May 2021 16:30:58 +0200
Subject: [PATCH] Changed UmaTokenProvider with AccessTokenProvider

---
 CHANGELOG.md                                        |  4 ++++
 pom.xml                                             | 12 ++----------
 .../interceptors/AuthorizationInterceptor.java      | 13 ++++---------
 3 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f5afa8..0f26408 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 # Changelog for Common Smartgears
 
+## [v1.3.0] - 2020-11-18
+
+- Changed UmaTokenProvider with AccessTokenProvider
+
 ## [v1.2.0] - 2020-11-18
 
 - interceptor for UmaToken added
diff --git a/pom.xml b/pom.xml
index f9f2838..31611e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 
 	<groupId>org.gcube.core</groupId>
 	<artifactId>common-gcube-calls</artifactId>
-	<version>1.2.0</version>
+	<version>1.3.0</version>
 
 	<properties>
 		<distroDirectory>distro</distroDirectory>
@@ -29,15 +29,7 @@
 			<artifactId>common-authorization</artifactId>
 			<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version>
 		</dependency>
-		<!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
-		<!-- https://mvnrepository.com/artifact/com.googlecode.json-simple/json-simple -->
-		<dependency>
-			<groupId>com.googlecode.json-simple</groupId>
-			<artifactId>json-simple</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-
-
+		
 		<dependency>
 			<groupId>org.gcube.core</groupId>
 			<artifactId>common-scope</artifactId>
diff --git a/src/main/java/org/gcube/common/calls/interceptors/AuthorizationInterceptor.java b/src/main/java/org/gcube/common/calls/interceptors/AuthorizationInterceptor.java
index 6baa3da..6e5a27b 100644
--- a/src/main/java/org/gcube/common/calls/interceptors/AuthorizationInterceptor.java
+++ b/src/main/java/org/gcube/common/calls/interceptors/AuthorizationInterceptor.java
@@ -1,13 +1,11 @@
 package org.gcube.common.calls.interceptors;
 
+import org.gcube.common.authorization.library.provider.AccessTokenProvider;
 import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
-import org.gcube.common.authorization.library.provider.UmaJWTProvider;
 import org.gcube.common.calls.Call;
 import org.gcube.common.calls.Interceptor;
 import org.gcube.common.calls.Request;
 import org.gcube.common.calls.Response;
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -21,14 +19,11 @@ public class AuthorizationInterceptor implements Interceptor {
 	@Override
 	public void handleRequest(Request request, Call call) {
 		String token = SecurityTokenProvider.instance.get();
-		String umaToken = UmaJWTProvider.instance.get();
+		String accessToken = AccessTokenProvider.instance.get();
 
-		if (umaToken!=null) {
+		if (accessToken!=null) {
 			try { 
-				JSONParser parser = new JSONParser();
-				JSONObject jsonObject = (JSONObject) parser.parse(umaToken);
-				String accesToken = (String) jsonObject.get("access_token");
-				request.addHeader(uma_token_header, "Bearer "+accesToken);	
+				request.addHeader(uma_token_header, "Bearer "+accessToken);	
 				logger.trace("uma token set");
 			}catch (Exception e) {
 				logger.error("error parsing uma token",e);