gCubeSystem
/
storage-manager-trigger
16
0
Fork 0
Code Issues Releases Wiki Activity

moved from JWTTokenProvider to AccessTokenProvider class 

update to 1.11.1-SNAPSHOT
This commit is contained in:
Roberto Cirillo 2021-07-15 15:20:51 +02:00
parent 8891676496
commit c33b84c6ca
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -8,7 +8,7 @@
</parent> </parent>
<groupId>org.gcube.contentmanagement</groupId> <groupId>org.gcube.contentmanagement</groupId>
<artifactId>storage-manager-trigger</artifactId> <artifactId>storage-manager-trigger</artifactId>
<version>1.11.0-SNAPSHOT</version> <version>1.11.1-SNAPSHOT</version>
<scm> <scm>
<url>https://code-repo.d4science.org/gCubeSystem/${project.artifactId}</url> <url>https://code-repo.d4science.org/gCubeSystem/${project.artifactId}</url>
</scm> </scm>

2
src/main/java/org/gcube/contentmanager/storageserver/consumer/UserAccountingConsumer.java
View File

@ -7,7 +7,7 @@ import java.util.List;
import org.bson.types.ObjectId; import org.bson.types.ObjectId;
import org.gcube.accounting.datamodel.usagerecords.StorageUsageRecord; 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.common.scope.api.ScopeProvider;
import org.gcube.contentmanager.storageserver.accounting.Report; import org.gcube.contentmanager.storageserver.accounting.Report;
import org.gcube.contentmanager.storageserver.accounting.ReportConfig; import org.gcube.contentmanager.storageserver.accounting.ReportConfig;

4
src/main/java/org/gcube/contentmanager/storageserver/utils/Utils.java
View File

@ -6,7 +6,7 @@ import java.io.StringReader;
import java.net.URL; import java.net.URL;
import java.util.Objects; 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.common.scope.api.ScopeProvider;
import org.gcube.oidc.rest.JWTToken; import org.gcube.oidc.rest.JWTToken;
import org.gcube.oidc.rest.OpenIdConnectRESTHelper; import org.gcube.oidc.rest.OpenIdConnectRESTHelper;
@ -34,7 +34,7 @@ public class Utils {
token = OpenIdConnectRESTHelper.queryUMAToken(oidcAddress, clientId, secret, context, null); token = OpenIdConnectRESTHelper.queryUMAToken(oidcAddress, clientId, secret, context, null);
logger.debug("UMA token retrieved for context "+context); logger.debug("UMA token retrieved for context "+context);
String tokenExtracted=getTokenFromJson(token); String tokenExtracted=getTokenFromJson(token);
UmaJWTProvider.instance.set(tokenExtracted); AccessTokenProvider.instance.set(tokenExtracted);
}else { }else {
logger.error("problem initializing token, one or more field not set"); logger.error("problem initializing token, one or more field not set");
throw new RuntimeException("problem initializing token, one or more field not set"); throw new RuntimeException("problem initializing token, one or more field not set");