From e82dfa44d1601fd36f4251be5d255428e919ba12 Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Tue, 25 May 2021 17:05:11 +0200
Subject: [PATCH] #21506: Updated to support new UMATokensProvider class

---
 CHANGELOG.md                                              | 4 ++++
 pom.xml                                                   | 5 ++---
 .../portal/usersaccount/WorkspaceCreateAccountThread.java | 8 ++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1afd2b9..482b0e8 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.0.4-SNAPSHOT] - 2021-05-25
+
+- Feature #21506: Updated to support new UMATokensProvider class
+
 ## [v2.0.3] - 2021-04-12
 
 Just removed obsolete Home library deps from pom which were forgotten there in 6.8.0 release
diff --git a/pom.xml b/pom.xml
index 8469b4c..26db506 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 	<artifactId>user-registration-hook</artifactId>
 	<packaging>war</packaging>
 	<name>user-registration-hook Hook</name>
-	<version>2.0.3</version>
+	<version>2.0.4-SNAPSHOT</version>
 	<scm>
 		<connection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</connection>
 		<developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</developerConnection>
@@ -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>
@@ -67,7 +67,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/usersaccount/WorkspaceCreateAccountThread.java b/src/main/java/org/gcube/portal/usersaccount/WorkspaceCreateAccountThread.java
index ebc4b38..9f8c8ab 100644
--- a/src/main/java/org/gcube/portal/usersaccount/WorkspaceCreateAccountThread.java
+++ b/src/main/java/org/gcube/portal/usersaccount/WorkspaceCreateAccountThread.java
@@ -3,7 +3,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
-import org.gcube.common.authorization.library.provider.UmaJWTProvider;
 
 import static org.gcube.common.authorization.client.Constants.authorizationService;
 import org.gcube.common.portal.PortalContext;
@@ -11,6 +10,7 @@ import org.gcube.common.scope.api.ScopeProvider;
 import org.gcube.common.storagehub.client.dsl.StorageHubClient;
 import org.gcube.common.storagehub.model.exceptions.UserNotAuthorizedException;
 import org.gcube.portal.oidc.lr62.OIDCUmaUtil;
+import org.gcube.portal.oidc.lr62.UMATokensProvider;
 import org.gcube.vomanagement.usermanagement.RoleManager;
 import org.gcube.vomanagement.usermanagement.UserManager;
 import org.gcube.vomanagement.usermanagement.impl.LiferayGroupManager;
@@ -44,7 +44,7 @@ public class WorkspaceCreateAccountThread implements Runnable {
 		SecurityTokenProvider.instance.set(authorizationToken);
 		ScopeProvider.instance.set(context);
 		String previousToken = authorizationToken;
-		String previousUMAToken = UmaJWTProvider.instance.get();
+		String previousUMAToken = UMATokensProvider.instance.get();
 		try {					
 			//get the super user
 			String infraContext = "/"+PortalContext.getConfiguration().getInfrastructureName();
@@ -83,12 +83,12 @@ public class WorkspaceCreateAccountThread implements Runnable {
 					 shc = new StorageHubClient();
 					 shc.createUserAccount(currentUsername);
 					SecurityTokenProvider.instance.set(previousToken);
-					UmaJWTProvider.instance.set(previousUMAToken);
+					UMATokensProvider.instance.set(previousUMAToken);
 					_log.info("shub.createUserAccount performed for "+username + " with super mega admin (Hopefully)");
 				}
 				_log.debug("shub.createUserAccount completed for "+username);
 				SecurityTokenProvider.instance.set(previousToken);
-				UmaJWTProvider.instance.set(previousUMAToken);
+				UMATokensProvider.instance.set(previousUMAToken);
 			}
 		}
 		catch (Exception e) {