diff --git a/CHANGELOG.md b/CHANGELOG.md index b00885c..cddc6b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ 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 + ## [v2.0.1] - 2022-06-16 - Release for HL portal removal diff --git a/pom.xml b/pom.xml index 0bea386..ba52623 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ accept-invite-portlet war accept-invite-portlet Portlet - 2.0.1 + 2.1.0.SNAPSHOT accept-invite-portlet manage the sent invitations @@ -34,7 +34,7 @@ org.gcube.distribution maven-portal-bom - 3.6.4 + 3.7.0 pom import @@ -56,11 +56,24 @@ json-simple provided - - org.gcube.portal - social-networking-library - provided - + + org.gcube.portal + social-library-stubs + [1.0.0-SNAPSHOT, 2.0.0) + provided + + + org.gcube.social-networking + social-service-client + [2.0.0-SNAPSHOT, 3.0.0) + provided + + + org.gcube.portal + social-networking-library + + + org.gcube.dvos usermanagement-core 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 d7d5765..5841f1d 100644 --- a/src/main/java/org/gcube/portlets/user/acceptinvite/PortletViewController.java +++ b/src/main/java/org/gcube/portlets/user/acceptinvite/PortletViewController.java @@ -13,6 +13,10 @@ */ package org.gcube.portlets.user.acceptinvite; +import static org.gcube.common.authorization.client.Constants.authorizationService; + +import java.util.ArrayList; +import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -24,6 +28,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; 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.portal.databook.server.DBCassandraAstyanaxImpl; import org.gcube.portal.databook.server.DatabookStore; @@ -75,7 +81,7 @@ public class PortletViewController { private static String MODEL_ATTR = "theModel"; private static DatabookStore store; - + private final static String DEFAULT_ROLE = "OrganizationMember"; /** * * @return the unique instance of the store @@ -115,6 +121,8 @@ public class PortletViewController { Invite invite = null; try { + String token = generateAuthorizationToken(); + SecurityTokenProvider.instance.set(token); invite = getStore().readInvite(inviteId); } catch (InviteIDNotFoundException | InviteStatusNotFoundException e) { e.printStackTrace(); @@ -146,7 +154,21 @@ public class PortletViewController { return PAGE_INVITE_PROCESS; } - + private static String generateAuthorizationToken() { + PortalContext pContext = PortalContext.getConfiguration(); + String context = "/" + pContext.getInfrastructureName(); + String username = "roberto.cirillo"; + List userRoles = new ArrayList<>(); + userRoles.add(DEFAULT_ROLE); + String token; + try { + token = authorizationService().generateUserToken(new UserInfo(username, userRoles), context); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + return token; + } @ResourceMapping(value="createAccount")