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 @@
user-registration-hook
war
user-registration-hook Hook
- 2.0.3
+ 2.0.4-SNAPSHOT
scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git
scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git
@@ -32,7 +32,7 @@
org.gcube.distribution
maven-portal-bom
- 3.6.1
+ 3.6.2-SNAPSHOT
pom
import
@@ -67,7 +67,6 @@
org.gcube.portal
oidc-library-portal
- [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)
provided
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) {