From 23b109755cd4c8e6b7f108ac2de14fd8f1a4ae90 Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Tue, 6 Apr 2021 12:18:19 +0200
Subject: [PATCH] none

---
 .settings/org.eclipse.wst.common.component    | 39 ++++++++++++-------
 pom.xml                                       |  6 +++
 .../user/wswidget/StorageHubServiceUtil.java  | 20 +++++++++-
 3 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index f2795c5..39e308c 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,19 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-        
-    <wb-module deploy-name="workspace-widget-portlet">
-                
-        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-                
-        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-                
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-                
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-                
-        <property name="context-root" value="workspace-widget-portlet"/>
-                
-        <property name="java-output-path" value="/workspace-widget-portlet/target/classes"/>
             
-    </wb-module>
     
+    <wb-module deploy-name="workspace-widget-portlet">
+                        
+        
+        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
+                        
+        
+        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
+                        
+        
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+                        
+        
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
+                        
+        
+        <property name="context-root" value="workspace-widget-portlet"/>
+                        
+        
+        <property name="java-output-path" value="/workspace-widget-portlet/target/classes"/>
+                    
+    
+    </wb-module>
+        
+
 </project-modules>
diff --git a/pom.xml b/pom.xml
index c5f76b3..f5e846d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,6 +76,12 @@
 			<artifactId>common-authorization</artifactId>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.gcube.portal</groupId>
+			<artifactId>oidc-library-portal</artifactId>
+			<version>[1.3.0-SNAPSHOT, 2.0.0)</version>
+			<scope>provided</scope>
+		</dependency>
 		<dependency>
 			<groupId>com.liferay.portal</groupId>
 			<artifactId>portal-service</artifactId>
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 16bdf6a..5924c32 100644
--- a/src/main/java/org/gcube/portlets/user/wswidget/StorageHubServiceUtil.java
+++ b/src/main/java/org/gcube/portlets/user/wswidget/StorageHubServiceUtil.java
@@ -7,6 +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;
@@ -14,6 +15,13 @@ import org.gcube.common.storagehub.client.plugins.AbstractPlugin;
 import org.gcube.common.storagehub.client.proxies.ItemManagerClient;
 import org.gcube.common.storagehub.client.proxies.WorkspaceManagerClient;
 import org.gcube.common.storagehub.model.items.Item;
+import org.gcube.oidc.rest.JWTToken;
+import org.gcube.portal.oidc.lr62.InvalidTokenException;
+import org.gcube.portal.oidc.lr62.MissingTokenException;
+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.portlets.user.wswidget.shared.AuthorizedUser;
 import org.gcube.portlets.user.wswidget.shared.WSItem;
 
@@ -149,9 +157,19 @@ public class StorageHubServiceUtil {
 	 * @param request
 	 * @return the VRE Folders Id
 	 */
-	public static String getVREFoldersId(long groupId) {
+	public static String getVREFoldersId(long groupId, HttpServletRequest request) {
 		String toReturn = "";
+		PortalContext pContext = PortalContext.getConfiguration();
 		String currentContext = PortalContext.getConfiguration().getCurrentScope(""+groupId);
+		long userId = pContext.getCurrentUser(request).getUserId();
+		try {
+			JWTToken umaToken = OIDCUmaUtil.getUMAToken(request, userId, currentContext);
+			UmaJWTProvider.instance.set(umaToken.getRaw());
+		} catch (InvalidTokenException | MissingTokenException | RefreshException | NotAuthorizedException
+				| UMAException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
 		_log.debug("getVREFoldersId, context="+currentContext);
 		ScopeProvider.instance.set(currentContext);
 		try {