diff --git a/pom.xml b/pom.xml index c3cf6c6..5aef340 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.gcube.contentmanagement storage-manager-trigger - 1.11.0-SNAPSHOT + 1.11.1-SNAPSHOT https://code-repo.d4science.org/gCubeSystem/${project.artifactId} diff --git a/src/main/java/org/gcube/contentmanager/storageserver/consumer/UserAccountingConsumer.java b/src/main/java/org/gcube/contentmanager/storageserver/consumer/UserAccountingConsumer.java index 657fed7..2e01913 100644 --- a/src/main/java/org/gcube/contentmanager/storageserver/consumer/UserAccountingConsumer.java +++ b/src/main/java/org/gcube/contentmanager/storageserver/consumer/UserAccountingConsumer.java @@ -7,7 +7,7 @@ import java.util.List; import org.bson.types.ObjectId; import org.gcube.accounting.datamodel.usagerecords.StorageUsageRecord; -import org.gcube.common.authorization.library.provider.UmaJWTProvider; +import org.gcube.common.authorization.library.provider.AccessTokenProvider; import org.gcube.common.scope.api.ScopeProvider; import org.gcube.contentmanager.storageserver.accounting.Report; import org.gcube.contentmanager.storageserver.accounting.ReportConfig; diff --git a/src/main/java/org/gcube/contentmanager/storageserver/utils/Utils.java b/src/main/java/org/gcube/contentmanager/storageserver/utils/Utils.java index 149d52f..b039294 100644 --- a/src/main/java/org/gcube/contentmanager/storageserver/utils/Utils.java +++ b/src/main/java/org/gcube/contentmanager/storageserver/utils/Utils.java @@ -6,7 +6,7 @@ import java.io.StringReader; import java.net.URL; import java.util.Objects; -import org.gcube.common.authorization.library.provider.UmaJWTProvider; +import org.gcube.common.authorization.library.provider.AccessTokenProvider; import org.gcube.common.scope.api.ScopeProvider; import org.gcube.oidc.rest.JWTToken; import org.gcube.oidc.rest.OpenIdConnectRESTHelper; @@ -34,7 +34,7 @@ public class Utils { token = OpenIdConnectRESTHelper.queryUMAToken(oidcAddress, clientId, secret, context, null); logger.debug("UMA token retrieved for context "+context); String tokenExtracted=getTokenFromJson(token); - UmaJWTProvider.instance.set(tokenExtracted); + AccessTokenProvider.instance.set(tokenExtracted); }else { logger.error("problem initializing token, one or more field not set"); throw new RuntimeException("problem initializing token, one or more field not set");