From d0665914edfa7af81135caaaa05ee0c197029a4e Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Tue, 15 Nov 2016 11:14:43 +0000
Subject: [PATCH] git-svn-id:
 http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/widgets/invite-friends-widget@134169
 82a268e6-3cf1-43bd-a215-b396298e98cf

---
 pom.xml                                       | 20 +++++------
 .../server/InviteServiceImpl.java             | 35 +++----------------
 2 files changed, 14 insertions(+), 41 deletions(-)

diff --git a/pom.xml b/pom.xml
index 90a4d26..e2debf6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
 	<groupId>org.gcube.portlets.widgets</groupId>
 	<artifactId>invite-friends-widget</artifactId>
 	<packaging>jar</packaging>
-	<version>1.2.0-SNAPSHOT</version>
+	<version>1.3.0-SNAPSHOT</version>
 	<name>gCube Invites widget</name>
 	<description>
 		gCube Invites widget Widget is a GWT Widget that can be used to automatically send invites to VRE users
@@ -83,16 +83,6 @@
 			<artifactId>gcube-widgets</artifactId>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.gcube.portal</groupId>
-			<artifactId>custom-portal-handler</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.gcube.applicationsupportlayer</groupId>
-			<artifactId>aslcore</artifactId>
-			<scope>provided</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.gcube.portal</groupId>
 			<artifactId>invites-common-library</artifactId>
@@ -130,6 +120,14 @@
 			<artifactId>portal-service</artifactId>
 			<scope>provided</scope>
 		</dependency>
+			<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+		</dependency>
 	</dependencies>
 	<build>
 		<!-- Generate compiled stuff in the folder used for developing mode -->
diff --git a/src/main/java/org/gcube/portlets/widgets/inviteswidget/server/InviteServiceImpl.java b/src/main/java/org/gcube/portlets/widgets/inviteswidget/server/InviteServiceImpl.java
index d80f4b5..60dd0f5 100644
--- a/src/main/java/org/gcube/portlets/widgets/inviteswidget/server/InviteServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/widgets/inviteswidget/server/InviteServiceImpl.java
@@ -1,10 +1,7 @@
 package org.gcube.portlets.widgets.inviteswidget.server;
 
-import org.gcube.application.framework.core.session.ASLSession;
-import org.gcube.application.framework.core.session.SessionManager;
+
 import org.gcube.common.portal.PortalContext;
-import org.gcube.portal.custom.communitymanager.SiteManagerUtil;
-import org.gcube.portal.custom.scopemanager.scopehelper.ScopeHelper;
 import org.gcube.portal.databook.shared.InviteOperationResult;
 import org.gcube.portal.invites.InvitesManager;
 import org.gcube.portlets.widgets.inviteswidget.client.InviteService;
@@ -13,44 +10,22 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.gwt.user.server.rpc.RemoteServiceServlet;
-import com.liferay.portal.util.PortalUtil;
 
-
-/**
- * The server side implementation of the RPC service.
- */
 @SuppressWarnings("serial")
 public class InviteServiceImpl extends RemoteServiceServlet implements InviteService {
 
 	private final static Logger _log = LoggerFactory.getLogger(InviteServiceImpl.class);
-
-	/**
-	 * the current ASLSession
-	 * @return the session
-	 */
-	private ASLSession getASLSession() {
-		String sessionID = this.getThreadLocalRequest().getSession().getId();
-		String user = (String) this.getThreadLocalRequest().getSession().getAttribute(ScopeHelper.USERNAME_ATTRIBUTE);
-		if (user == null) {
-			_log.warn("USER IS NULL setting test.user");
-			user = "test.user";
-		}
-		else {
-			_log.info("LIFERAY PORTAL DETECTED user=" + user);
-		}
-		return SessionManager.getInstance().getASLSession(sessionID, user);
-	}
 	/**
 	 * 
 	 */
 	@Override
 	public InviteOperationResult sendInvite(String name, String lastName, String email) throws IllegalArgumentException {
-		ASLSession aslSession = getASLSession();
+		
 	
 		String lowercaseEmail = email.toLowerCase();
 		String portalUrl = null;
 		String vreDescription  = null;
-		long groupId = getASLSession().getGroupId();
+		long groupId = PortalContext.getConfiguration().getCurrentGroupId(getThreadLocalRequest());
 		try {
 			portalUrl = PortalContext.getConfiguration().getGatewayURL(this.getThreadLocalRequest());
 			vreDescription = new LiferayGroupManager().getGroup(groupId).getDescription();
@@ -59,8 +34,8 @@ public class InviteServiceImpl extends RemoteServiceServlet implements InviteSer
 			_log.warn("While trying to send email for invitation to " + lowercaseEmail);
 			return null;
 		} 
-		String portalSenderEmail = PortalContext.getConfiguration().getSenderEmail();
-		return InvitesManager.getInstance().sendInvite(this.getThreadLocalRequest(), aslSession, portalSenderEmail, portalUrl, name, lastName, lowercaseEmail, vreDescription);
+		String portalSenderEmail = PortalContext.getConfiguration().getSenderEmail(getThreadLocalRequest());
+		return InvitesManager.getInstance().sendInvite(this.getThreadLocalRequest(), portalSenderEmail, portalUrl, name, lastName, lowercaseEmail, vreDescription);
 	}