diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 2530a4b..5218185 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 a5cddaa..849834e 100644 --- a/pom.xml +++ b/pom.xml @@ -37,13 +37,30 @@ org.gcube.distribution maven-portal-bom - LATEST + 3.6.0-SNAPSHOT pom import + + org.gcube.common + event-publisher-library + [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT) + provided + + + org.gcube.portal + event-publisher-portal + [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT) + provided + + + com.googlecode.json-simple + json-simple + provided + org.gcube.portal social-networking-library diff --git a/src/main/java/org/gcube/portlets/user/acceptinvite/CreateUserAccountEvent.java b/src/main/java/org/gcube/portlets/user/acceptinvite/CreateUserAccountEvent.java new file mode 100644 index 0000000..7e6c702 --- /dev/null +++ b/src/main/java/org/gcube/portlets/user/acceptinvite/CreateUserAccountEvent.java @@ -0,0 +1,44 @@ +package org.gcube.portlets.user.acceptinvite; + +import org.gcube.portal.event.publisher.lr62.PortalEvent; + +import com.liferay.portal.security.auth.DefaultScreenNameGenerator; + +public class CreateUserAccountEvent extends PortalEvent { + + private static final long serialVersionUID = 1L; + public static final String EVENT_NAME = "invitation-accepted"; + + private String firstname; + private String surname; + private String email; + private String tempPwd; + private String username; + + public CreateUserAccountEvent(String username, String firstname, String surname, String email, String tempPwd) { + super(EVENT_NAME); + DefaultScreenNameGenerator gen = new DefaultScreenNameGenerator(); + // gen.generate(companyId, userId, emailAddress) + this.username = username; + this.firstname = firstname; + this.surname = surname; + this.email = email; + this.tempPwd = tempPwd; + } + + public String getFirstname() { + return firstname; + } + public String getSurname() { + return surname; + } + public String getEmail() { + return email; + } + public String getTempPwd() { + return tempPwd; + } + public String getUsername() { + return username; + } +} diff --git a/src/main/webapp/WEB-INF/jsp/view.jsp b/src/main/webapp/WEB-INF/jsp/view.jsp index 09751ea..c7137d6 100644 --- a/src/main/webapp/WEB-INF/jsp/view.jsp +++ b/src/main/webapp/WEB-INF/jsp/view.jsp @@ -91,7 +91,8 @@ src="<%=renderRequest.getContextPath()%>/images/loader.gif" /> - + To accept the invite, you can choose to create a new account by filling in the information below or sign up with your academic/social account.