From d6ba384097b8fc69848edee33bdc29faf07f34cc Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Mon, 22 Apr 2024 17:11:42 +0200 Subject: [PATCH] Incident #27306 --- CHANGELOG.md | 1 + pom.xml | 2 +- .../portlets/user/acceptinvite/PortletViewController.java | 7 +++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cddc6b0..ed3c9af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ 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.1.0-SNAPSHOT] - 2024-04-22 +- Fix for Incident #27306 ## [v2.0.1] - 2022-06-16 diff --git a/pom.xml b/pom.xml index ba52623..6d13795 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ accept-invite-portlet war accept-invite-portlet Portlet - 2.1.0.SNAPSHOT + 2.1.0-SNAPSHOT accept-invite-portlet manage the sent invitations diff --git a/src/main/java/org/gcube/portlets/user/acceptinvite/PortletViewController.java b/src/main/java/org/gcube/portlets/user/acceptinvite/PortletViewController.java index 5841f1d..5a652bb 100644 --- a/src/main/java/org/gcube/portlets/user/acceptinvite/PortletViewController.java +++ b/src/main/java/org/gcube/portlets/user/acceptinvite/PortletViewController.java @@ -31,6 +31,7 @@ import org.apache.commons.codec.binary.Base64; import org.gcube.common.authorization.library.provider.SecurityTokenProvider; import org.gcube.common.authorization.library.provider.UserInfo; import org.gcube.common.portal.PortalContext; +import org.gcube.common.scope.api.ScopeProvider; import org.gcube.portal.databook.server.DBCassandraAstyanaxImpl; import org.gcube.portal.databook.server.DatabookStore; import org.gcube.portal.databook.shared.Invite; @@ -88,6 +89,9 @@ public class PortletViewController { */ public static synchronized DatabookStore getStore() { if (store == null) { + PortalContext pContext = PortalContext.getConfiguration(); + String context = "/" + pContext.getInfrastructureName(); + ScopeProvider.instance.set(context); store = new DBCassandraAstyanaxImpl(); } return store; @@ -123,6 +127,8 @@ public class PortletViewController { try { String token = generateAuthorizationToken(); SecurityTokenProvider.instance.set(token); + + invite = getStore().readInvite(inviteId); } catch (InviteIDNotFoundException | InviteStatusNotFoundException e) { e.printStackTrace(); @@ -157,6 +163,7 @@ public class PortletViewController { private static String generateAuthorizationToken() { PortalContext pContext = PortalContext.getConfiguration(); String context = "/" + pContext.getInfrastructureName(); + ScopeProvider.instance.set(context); String username = "roberto.cirillo"; List userRoles = new ArrayList<>(); userRoles.add(DEFAULT_ROLE);