From 306b1f8dcde27c1a933dc5b459b437693b42234e Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Fri, 4 Nov 2016 17:42:16 +0000 Subject: [PATCH] removed client context dpenendncy git-svn-id: https://svn.research-infrastructures.eu/d4science/gcube/trunk/portal/portal-manager@133916 82a268e6-3cf1-43bd-a215-b396298e98cf --- pom.xml | 5 ----- .../org/gcube/common/portal/GCubePortalConstants.java | 3 +++ .../java/org/gcube/common/portal/PortalContext.java | 10 +++++----- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index ecbee23..c0301bb 100644 --- a/pom.xml +++ b/pom.xml @@ -41,11 +41,6 @@ - - org.gcube.portal - client-context-library - [1.0.0-SNAPSHOT,) - org.gcube.dvos usermanagement-core diff --git a/src/main/java/org/gcube/common/portal/GCubePortalConstants.java b/src/main/java/org/gcube/common/portal/GCubePortalConstants.java index f3afba1..4fd76dc 100644 --- a/src/main/java/org/gcube/common/portal/GCubePortalConstants.java +++ b/src/main/java/org/gcube/common/portal/GCubePortalConstants.java @@ -18,4 +18,7 @@ public class GCubePortalConstants { public static final String SENDER_EMAIL = "notificationSenderEmail"; public static final String GATEWAY_NAME = "portalinstancename"; public static final String ADMIN_USERNAME = "administratorUsername"; + + public static final String VRE_ID_ATTR_NAME = "gcube-vreid"; + public static final String USER_ID_ATTR_NAME = "gcube-userId"; } diff --git a/src/main/java/org/gcube/common/portal/PortalContext.java b/src/main/java/org/gcube/common/portal/PortalContext.java index e44a593..401e8f6 100644 --- a/src/main/java/org/gcube/common/portal/PortalContext.java +++ b/src/main/java/org/gcube/common/portal/PortalContext.java @@ -13,7 +13,6 @@ import javax.servlet.http.HttpServletRequest; import org.gcube.common.authorization.library.provider.UserInfo; import org.gcube.common.scope.api.ScopeProvider; -import org.gcube.portal.clientcontext.client.GCubeClientContext; import org.gcube.vomanagement.usermanagement.impl.LiferayGroupManager; import org.gcube.vomanagement.usermanagement.impl.LiferayUserManager; import org.gcube.vomanagement.usermanagement.model.CustomAttributeKeys; @@ -42,7 +41,8 @@ import com.liferay.portal.util.PortalUtil; */ public class PortalContext { private static final Logger _log = LoggerFactory.getLogger(PortalContext.class); - + public static final String VRE_ID_ATTR_NAME = "gcube-vreid"; + public static final String USER_ID_ATTR_NAME = "gcube-userId"; /** * Scope separators used in linear syntax. */ @@ -130,7 +130,7 @@ public class PortalContext { * @see GCubeUser */ public GCubeUser getCurrentUser(HttpServletRequest httpServletRequest) { - String userIdNo = httpServletRequest.getHeader(GCubeClientContext.USER_ID_ATTR_NAME); + String userIdNo = httpServletRequest.getHeader(USER_ID_ATTR_NAME); if (userIdNo != null) { long userId = -1; try { @@ -161,7 +161,7 @@ public class PortalContext { * @see GCubeUser */ public String getCurrentScope(HttpServletRequest httpServletRequest) { - String groupIdNo = httpServletRequest.getHeader(GCubeClientContext.VRE_ID_ATTR_NAME); + String groupIdNo = httpServletRequest.getHeader(VRE_ID_ATTR_NAME); if (groupIdNo != null) { long groupId = -1; try { @@ -197,7 +197,7 @@ public class PortalContext { * @see GCubeUser */ public String getCurrentUserToken(HttpServletRequest httpServletRequest) { - String groupIdNo = httpServletRequest.getHeader(GCubeClientContext.VRE_ID_ATTR_NAME); + String groupIdNo = httpServletRequest.getHeader(VRE_ID_ATTR_NAME); if (groupIdNo != null) { String scope = getCurrentScope(httpServletRequest); String username = getCurrentUser(httpServletRequest).getUsername();