From 2e99cc250183b5895dc640de0bdf63ae19385231 Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Tue, 6 Sep 2016 14:19:06 +0000
Subject: [PATCH] updated to auth2

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portal/custom-portal-handler@131157 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 pom.xml                                         |  2 +-
 .../scopemanager/scopehelper/ScopeHelper.java   | 17 +++++++----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index cef4188..8853474 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
 	<groupId>org.gcube.portal</groupId>
 	<artifactId>custom-portal-handler</artifactId>
-	<version>2.0.1-SNAPSHOT</version>
+	<version>2.1.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>Custom Portal Handler</name>
 	<description>
diff --git a/src/main/java/org/gcube/portal/custom/scopemanager/scopehelper/ScopeHelper.java b/src/main/java/org/gcube/portal/custom/scopemanager/scopehelper/ScopeHelper.java
index 2844721..c1e107b 100644
--- a/src/main/java/org/gcube/portal/custom/scopemanager/scopehelper/ScopeHelper.java
+++ b/src/main/java/org/gcube/portal/custom/scopemanager/scopehelper/ScopeHelper.java
@@ -33,6 +33,8 @@ import com.liferay.portal.service.RoleLocalServiceUtil;
 import com.liferay.portal.service.UserLocalServiceUtil;
 import com.liferay.portal.theme.ThemeDisplay;
 import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
+import org.gcube.common.authorization.library.provider.UserInfo;
+
 import static org.gcube.common.authorization.client.Constants.authorizationService;
 
 public class ScopeHelper {	
@@ -126,20 +128,14 @@ public class ScopeHelper {
 			SessionManager.getInstance().getASLSession(sessionID, username).setUserGender(isMale? GenderType.MALE : GenderType.FEMALE);
 
 			setAuthorizationToken(SessionManager.getInstance().getASLSession(sessionID, username));
-		} catch (UserManagementSystemException e) {
+		} catch (Exception e) {
 			e.printStackTrace();
-		} catch (GroupRetrievalFault e) {
-			e.printStackTrace();
-		} catch (PortalException e) {
-			e.printStackTrace();
-		} catch (SystemException e) {
-			e.printStackTrace();
-		}	
+		} 
 
 	}
 	private final static String DEFAULT_ROLE = "OrganizationMember";
 
-	private static void setAuthorizationToken(ASLSession session) {
+	private static void setAuthorizationToken(ASLSession session) throws Exception {
 		String username = session.getUsername();
 		String scope = session.getScope();
 		ScopeProvider.instance.set(scope);
@@ -147,7 +143,8 @@ public class ScopeHelper {
 		List<String> userRoles = new ArrayList<>();
 		userRoles.add(DEFAULT_ROLE);
 		session.setSecurityToken(null);
-		String token = authorizationService().build().generate(session.getUsername(), userRoles);
+		String token = authorizationService().generateUserToken(new UserInfo(session.getUsername(), userRoles), scope);
+		
 		_log.debug("received token: "+token);
 		session.setSecurityToken(token);
 		_log.info("Security token set in session for: "+username + " on " + scope);