swtiched to StorageHub

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portal/liferay62-plugins/user-registration-hook@183528 82a268e6-3cf1-43bd-a215-b396298e98cf

.classpath

@@ -15,6 +15,7 @@
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">

.settings/org.eclipse.jdt.core.prefs

@@ -5,4 +5,5 @@ org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8

.settings/org.eclipse.wst.common.component

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="user-registration-hook-hook">
+    <wb-module deploy-name="user-registration-hook">
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>

pom.xml

@@ -1,19 +1,20 @@
 <?xml version="1.0"?>
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>maven-parent</artifactId>
 		<groupId>org.gcube.tools</groupId>
-		<version>1.0.0</version>
+		<version>1.1.0</version>
 		<relativePath />
 	</parent>
 	<groupId>org.gcube.portal.liferay</groupId>
 	<artifactId>user-registration-hook</artifactId>
 	<packaging>war</packaging>
 	<name>user-registration-hook Hook</name>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 
 	<build>
 		<plugins>
@@ -32,7 +33,6 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.5</version>
 				<configuration>
 					<encoding>UTF-8</encoding>
 					<source>1.8</source>
@@ -53,33 +53,22 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>maven-portal-bom</artifactId>
-				<version>LATEST</version>
+				<version>3.6.0</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
 	<dependencies>
+		<dependency>
+			<groupId>org.gcube.common</groupId>
+			<artifactId>storagehub-client-library</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.gcube.portal</groupId>
 			<artifactId>notifications-common-library</artifactId>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.gcube.common</groupId>
-			<artifactId>home-library</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.gcube.common</groupId>
-			<artifactId>home-library-jcr</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.gcube.common</groupId>
-			<artifactId>home-library-model</artifactId>
-			<scope>provided</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.gcube.dvos</groupId>
 			<artifactId>usermanagement-core</artifactId>

src/main/java/org/gcube/portal/usersaccount/WorkspaceCreateAccountThread.java

@@ -1,40 +1,74 @@
 package org.gcube.portal.usersaccount;
+import java.util.ArrayList;
+import java.util.List;
+
 import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
-import org.gcube.common.homelibrary.home.HomeLibrary;
+import static org.gcube.common.authorization.client.Constants.authorizationService;
-import org.gcube.common.homelibrary.home.workspace.Workspace;
 import org.gcube.common.portal.PortalContext;
 import org.gcube.common.scope.api.ScopeProvider;
+import org.gcube.common.storagehub.client.dsl.StorageHubClient;
+import org.gcube.vomanagement.usermanagement.RoleManager;
+import org.gcube.vomanagement.usermanagement.UserManager;
+import org.gcube.vomanagement.usermanagement.impl.LiferayGroupManager;
+import org.gcube.vomanagement.usermanagement.impl.LiferayRoleManager;
+import org.gcube.vomanagement.usermanagement.impl.LiferayUserManager;
+import org.gcube.vomanagement.usermanagement.model.GCubeRole;
+import org.gcube.vomanagement.usermanagement.model.GCubeUser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class WorkspaceCreateAccountThread implements Runnable {
 	private static Logger _log = LoggerFactory.getLogger(WorkspaceCreateAccountThread.class);
-
+	public static final String AUTORISED_INFRA_ROLE = "Infrastructure-Manager";
 	private String newUserUserName;
 
 	public WorkspaceCreateAccountThread(String newUserUserName,	String newUserFullName, String newUserEmailAddress) {
 		super();
 		this.newUserUserName = newUserUserName;
-		_log.info("Calling HomeLibrary for Workspace creation to new user: " + newUserUserName + " ("+newUserFullName+")");
+		_log.info("Calling StorageHub for Workspace creation to new user: " + newUserUserName + " ("+newUserFullName+")");
 	}
 
 	@Override
 	public void run() {
 		getWS(newUserUserName, "/"+PortalContext.getConfiguration().getInfrastructureName());
 	}
-	public static Workspace getWS(String currentUsername, String context) {
+	public static void getWS(String currentUsername, String context) {
 		String username = currentUsername;
 		String authorizationToken = PortalContext.getConfiguration().getCurrentUserToken(context, username);
 		SecurityTokenProvider.instance.set(authorizationToken);
 		ScopeProvider.instance.set(context);
-		try {		
+		String previousToken = authorizationToken;
-			Workspace toReturn = HomeLibrary.getUserWorkspace(username);
+		try {					
-			_log.info("Done Workspace creation for user: " + currentUsername);
+			//get the super user
-			return toReturn;
+			String infraContext = "/"+PortalContext.getConfiguration().getInfrastructureName();
+			long groupId = new LiferayGroupManager().getGroupIdFromInfrastructureScope(infraContext);
+			RoleManager rm = new LiferayRoleManager();
+			UserManager uMan = new LiferayUserManager();
+			long roleId = rm.getRoleId(AUTORISED_INFRA_ROLE, groupId);
+			List<GCubeUser> users = uMan.listUsersByGroupAndRole(groupId, roleId);
+			if (users.isEmpty()) {
+				_log.error("Cannot create this user account on storageHub there is no user having role {} on context {}",  AUTORISED_INFRA_ROLE , infraContext);
+				return;
+			}
+			else {
+				GCubeUser theAdmin = users.get(0);
+				String theAdminToken = PortalContext.getConfiguration().getCurrentUserToken(infraContext, theAdmin.getUsername());
+				List<GCubeRole> theAdminRoles = rm.listRolesByUserAndGroup(theAdmin.getUserId(), groupId);			
+				List<String> rolesString = new ArrayList<String>();
+				for (GCubeRole gCubeRole : theAdminRoles) {
+					rolesString.add(gCubeRole.getRoleName());
+				}
+				authorizationService().setTokenRoles(theAdminToken, rolesString);
+				SecurityTokenProvider.instance.set(theAdminToken);
+				StorageHubClient shc = new StorageHubClient();
+				shc.createUserAccount(currentUsername);
+				SecurityTokenProvider.instance.set(previousToken);
+			}
 		}
 		catch (Exception e) {
 			e.printStackTrace();
-			return null;
+			SecurityTokenProvider.instance.set(previousToken);
+			return;
 		}
 	}
 }

src/main/webapp/WEB-INF/liferay-plugin-package.properties

@@ -1,6 +1,6 @@
 name=user-registration-hook
 module-group-id=liferay
-module-incremental-version=2
+module-incremental-version=3
 tags=
 short-description=
 change-log=