From 0ef38bfbcda80ee0d2890b3b96672ade7aca76f8 Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Tue, 25 May 2021 16:29:28 +0200
Subject: [PATCH] #21503 Update threadlocal-vars-cleaner to support
 AccessTokenProvider

---
 CHANGELOG.md                                                 | 4 ++++
 pom.xml                                                      | 5 ++---
 .../gcube/portal/threadlocalexec/SmartGearsPortalValve.java  | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10f9eb0..0787897 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@
 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.3.1-SNAPSHOT] - 2021-05-25
+
+- Feature #21503 Update threadlocal-vars-cleaner to support AccessTokenProvider
+
 ## [v2.3.0] - 2021-05-03
 
 - Fix Bug #20591 Keycloak-LR 6.2 Integration: portlet calls in landing page have not UMA token set
diff --git a/pom.xml b/pom.xml
index a6ac47d..08210cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 
 	<groupId>org.gcube.portal</groupId>
 	<artifactId>threadlocal-vars-cleaner</artifactId>
-	<version>2.3.0</version>
+	<version>2.3.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>threadlocal-vars-cleaner</name>
 	<description>This component clean the Smartgears ThreadLocal variables each time a new Thread is assigned to a request from tomcat thread pool</description>
@@ -32,7 +32,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>maven-portal-bom</artifactId>
-				<version>3.6.1</version>
+				<version>3.6.2-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -63,7 +63,6 @@
 		<dependency>
 			<groupId>org.gcube.portal</groupId>
 			<artifactId>oidc-library-portal</artifactId>
-			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
diff --git a/src/main/java/org/gcube/portal/threadlocalexec/SmartGearsPortalValve.java b/src/main/java/org/gcube/portal/threadlocalexec/SmartGearsPortalValve.java
index 4ad1499..5a22c3d 100644
--- a/src/main/java/org/gcube/portal/threadlocalexec/SmartGearsPortalValve.java
+++ b/src/main/java/org/gcube/portal/threadlocalexec/SmartGearsPortalValve.java
@@ -15,9 +15,9 @@ import org.apache.catalina.connector.Request;
 import org.apache.catalina.connector.Response;
 import org.apache.catalina.valves.ValveBase;
 import org.gcube.common.authorization.client.exceptions.ObjectNotFound;
+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.provider.UserInfo;
 import org.gcube.common.portal.PortalContext;
 import org.gcube.common.scope.api.ScopeProvider;
@@ -46,7 +46,7 @@ public class SmartGearsPortalValve extends ValveBase {
         SecurityTokenProvider.instance.reset();
         ScopeProvider.instance.reset();
         AuthorizationProvider.instance.reset();
-        UmaJWTProvider.instance.reset();
+        AccessTokenProvider.instance.reset();
         //_log.trace("SmartGearsPortalValve SecurityTokenProvider and AuthorizationProvider reset OK");
         if (req instanceof HttpServletRequest) {
             HttpServletRequest request = (HttpServletRequest) req;