From e9330f651e1452ed38d2975d548dc64ec383eaa5 Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Tue, 25 May 2021 17:58:30 +0200 Subject: [PATCH] Feature #21507 support new UMATokensProvider class --- .settings/org.eclipse.wst.common.component | 36 ++++++++++++++----- CHANGELOG.md | 6 +++- pom.xml | 10 ++++-- .../user/wswidget/StorageHubServiceUtil.java | 7 ++-- .../user/wswidget/WorkspaceWidget.java | 5 +-- 5 files changed, 46 insertions(+), 18 deletions(-) diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 5247f67..32e7553 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,49 +1,67 @@ - + + + - + + + - + + + - + + + - + + + - + + + - + + + - + + + - + + + diff --git a/CHANGELOG.md b/CHANGELOG.md index 02db75a..d63273b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,13 @@ 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). +## [v1.5.1-SNAPSHOT] - 2021-05-25 + +- Feature #21507 support new UMATokensProvider class + ## [v1.5.0] - 2021-04-06 -Removed legacy auth dependency +- Removed legacy auth dependency ## [v1.4.1] - 2021-01-26 diff --git a/pom.xml b/pom.xml index 36e8ecb..aef90d8 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ workspace-widget-portlet war workspace-widget-portlet Portlet - 1.5.0 + 1.5.1-SNAPSHOT Workspace Widget Portlet is a small Front-end component looking like G Drive which exposes the content of the user's workspace or VRE Folders in read only mode. @@ -36,7 +36,7 @@ org.gcube.distribution maven-portal-bom - 3.6.1 + 3.6.2-SNAPSHOT pom import @@ -79,7 +79,11 @@ org.gcube.portal oidc-library-portal - [1.3.0-SNAPSHOT, 2.0.0) + provided + + + org.gcube.common + oidc-library provided diff --git a/src/main/java/org/gcube/portlets/user/wswidget/StorageHubServiceUtil.java b/src/main/java/org/gcube/portlets/user/wswidget/StorageHubServiceUtil.java index 0178891..85f9668 100644 --- a/src/main/java/org/gcube/portlets/user/wswidget/StorageHubServiceUtil.java +++ b/src/main/java/org/gcube/portlets/user/wswidget/StorageHubServiceUtil.java @@ -7,7 +7,7 @@ import java.util.List; import javax.portlet.ResourceRequest; import javax.servlet.http.HttpServletRequest; -import org.gcube.common.authorization.library.provider.UmaJWTProvider; + import org.gcube.common.portal.GCubePortalConstants; import org.gcube.common.portal.PortalContext; import org.gcube.common.scope.api.ScopeProvider; @@ -22,6 +22,7 @@ import org.gcube.portal.oidc.lr62.NotAuthorizedException; import org.gcube.portal.oidc.lr62.OIDCUmaUtil; import org.gcube.portal.oidc.lr62.RefreshException; import org.gcube.portal.oidc.lr62.UMAException; +import org.gcube.portal.oidc.lr62.UMATokensProvider; import org.gcube.portlets.user.wswidget.shared.AuthorizedUser; import org.gcube.portlets.user.wswidget.shared.WSItem; @@ -146,7 +147,7 @@ public class StorageHubServiceUtil { try { long userId = PortalUtil.getUser(request).getUserId(); JWTToken umaToken = OIDCUmaUtil.getUMAToken(request, userId, currentContext); - UmaJWTProvider.instance.set(umaToken.getRaw()); + UMATokensProvider.instance.set(umaToken.getRaw()); } catch (Exception e1) { e1.printStackTrace(); } @@ -173,7 +174,7 @@ public class StorageHubServiceUtil { String username = currentUsername; try { JWTToken umaToken = OIDCUmaUtil.getUMAToken(request, username, currentContext); - UmaJWTProvider.instance.set(umaToken.getRaw()); + UMATokensProvider.instance.set(umaToken.getRaw()); } catch (InvalidTokenException | MissingTokenException | RefreshException | NotAuthorizedException | UMAException e1) { _log.warn("could not get UMA Token for context="+currentContext); diff --git a/src/main/java/org/gcube/portlets/user/wswidget/WorkspaceWidget.java b/src/main/java/org/gcube/portlets/user/wswidget/WorkspaceWidget.java index 9cf8a1d..34be912 100644 --- a/src/main/java/org/gcube/portlets/user/wswidget/WorkspaceWidget.java +++ b/src/main/java/org/gcube/portlets/user/wswidget/WorkspaceWidget.java @@ -12,7 +12,7 @@ import javax.portlet.ResourceResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.gcube.common.authorization.library.provider.UmaJWTProvider; + import org.gcube.common.scope.api.ScopeProvider; import org.gcube.common.storagehub.client.StreamDescriptor; import org.gcube.common.storagehub.client.dsl.FileContainer; @@ -26,6 +26,7 @@ import org.gcube.common.storagehub.model.items.ExternalURL; import org.gcube.common.storagehub.model.items.Item; import org.gcube.oidc.rest.JWTToken; import org.gcube.portal.oidc.lr62.OIDCUmaUtil; +import org.gcube.portal.oidc.lr62.UMATokensProvider; import org.gcube.portlets.user.wswidget.shared.AuthorizedUser; import org.gcube.portlets.user.wswidget.shared.Breadcrumb; import org.gcube.portlets.user.wswidget.shared.WSItem; @@ -70,7 +71,7 @@ public class WorkspaceWidget extends MVCPortlet { try { userId = PortalUtil.getUser(resourceRequest).getUserId(); JWTToken umaToken = OIDCUmaUtil.getUMAToken(httpReq, userId, currentContext); - UmaJWTProvider.instance.set(umaToken.getRaw()); + UMATokensProvider.instance.set(umaToken.getRaw()); } catch (Exception e1) { e1.printStackTrace(); }