diff --git a/.classpath b/.classpath index cb30d4a..a2aef7d 100644 --- a/.classpath +++ b/.classpath @@ -24,27 +24,11 @@ - - - - - - - - - - - - - - - - - + diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 4b7cda2..e9838fa 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -4,6 +4,9 @@ + + uses + diff --git a/pom.xml b/pom.xml index 0ec067f..c663420 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.gcube.portlets.admin create-users war - 2.0.0-SNAPSHOT + 2.1.0-SNAPSHOT Create users portlet Create users portlet allows a VRE-Manager to enter user's personal data and automatically register he/she in the portal. @@ -94,7 +94,6 @@ com.github.gwtbootstrap gwt-bootstrap - 2.3.2.0 org.gcube.dvos @@ -104,7 +103,6 @@ com.liferay.portal portal-service - ${liferayVersion} provided @@ -131,27 +129,6 @@ social-networking-library provided - - org.gcube.common - home-library-model - provided - - - org.gcube.common - home-library - provided - - - asm-all - asm - - - - - org.gcube.common - home-library-jcr - provided - junit junit @@ -216,7 +193,7 @@ 2.2 - ${distroDirectory}/descriptor.xml + distro/descriptor.xml diff --git a/src/main/java/org/gcube/portlets/admin/createusers/server/CreateUsersImpl.java b/src/main/java/org/gcube/portlets/admin/createusers/server/CreateUsersImpl.java index 5f5626f..ef5c605 100644 --- a/src/main/java/org/gcube/portlets/admin/createusers/server/CreateUsersImpl.java +++ b/src/main/java/org/gcube/portlets/admin/createusers/server/CreateUsersImpl.java @@ -13,7 +13,6 @@ import javax.mail.internet.InternetAddress; import org.gcube.application.framework.core.session.ASLSession; import org.gcube.application.framework.core.session.SessionManager; -import org.gcube.common.homelibrary.home.HomeLibrary; import org.gcube.common.portal.PortalContext; import org.gcube.portal.custom.scopemanager.scopehelper.ScopeHelper; import org.gcube.portlets.admin.createusers.client.HandleUsersService; @@ -38,7 +37,6 @@ import com.liferay.portal.kernel.util.PropsUtil; import com.liferay.portal.model.Company; import com.liferay.portal.service.CompanyLocalServiceUtil; import com.liferay.portal.service.UserLocalServiceUtil; -import com.liferay.portal.util.PortalUtil; /** * The server side implementation of the RPC service. @@ -222,7 +220,7 @@ public class CreateUsersImpl extends RemoteServiceServlet implements HandleUsers InternetAddress from = new InternetAddress(emailSender); LiferayUserManager userManager = new LiferayUserManager(); - String portalUrl = PortalUtil.getPortalURL(getCompany().getVirtualHostname(), 443, true); + String portalUrl = context.getGatewayURL(getThreadLocalRequest()); String username = userManager.getFullNameFromEmail(email); MailMessage mailMessage = new MailMessage(); @@ -230,11 +228,11 @@ public class CreateUsersImpl extends RemoteServiceServlet implements HandleUsers mailMessage.setTo(to); String body = "

Dear " + username + ",
" + "
" + - "Welcome! You recently created an account at " + portalUrl + ". Your password is not sent by email for security purposes.
" + + "Welcome! Your new account at " + portalUrl + " is ready to be used. Your temporary password is training1, you will be asked to reset it at your first login.
" + "
" + "Sincerely,
" + gatewayName + "
" + emailSender + "
" + portalUrl; - String subject = portalUrl + ": Your New Account was created successfully!"; + String subject = gatewayName + ": Your New Account was created successfully!"; mailMessage.setBody(body); mailMessage.setSubject(subject); @@ -328,15 +326,14 @@ public class CreateUsersImpl extends RemoteServiceServlet implements HandleUsers isMale, null, null, - sendEmail, // determine if we need to send him/her an email + false, // determine if we need to send him/her an email true); // force the password reset // adding to the current VRE userManager.assignUserToGroup(getCurrentGroupID(), userManager.getUserId(user.getUsername())); - - //adding to the HL - addUserToHLGroup(user.getUsername(), session.getScope()); - + if (sendEmail) + sendEmailToUser(email); + }catch(Exception e){ // unable to create.. we need to delete it from the list of users @@ -500,20 +497,6 @@ public class CreateUsersImpl extends RemoteServiceServlet implements HandleUsers return false; } - /** - * Add user to Home Library Group - * @param username - * @param group - */ - private void addUserToHLGroup(String username, String group) { - try { - org.gcube.common.homelibrary.home.workspace.usermanager.UserManager um = HomeLibrary.getHomeManagerFactory().getUserManager(); - um.associateUserToGroup(group, username); - } catch (Exception e) { - logger.error("Failed to get the usermanager from HL. Could not add user to the HL group"); - } - } - /** * Get the current group ID *