ISSUE-200 add objects for additional email addresses

also relates to github login. The email address is not transmitted from
github if not explicitly set visible, i think. That means #200 gets more
and more important.

bwreg-entities/src/main/java/edu/kit/scc/webreg/entity/EventType.java

@@ -74,5 +74,13 @@ public enum EventType {
 	PROJECT_INVITATION_EMAIL_DECLINED,
 	
 	PROJECT_MEMBER_ADD,
-	PROJECT_MEMBER_REMOVED
+	PROJECT_MEMBER_REMOVED,
+	
+	/*
+	 * Email Address events
+	 */
+	EMAIL_ADDRESS_ADDED,
+	EMAIL_ADDRESS_REDO_VERIFICATION,
+	EMAIL_ADDRESS_VERIFIED,
+	
 }

bwreg-entities/src/main/java/edu/kit/scc/webreg/entity/identity/IdentityEmailAddressEntity.java

+/*******************************************************************************
+ * Copyright (c) 2014 Michael Simon.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ * 
+ * Contributors:
+ *     Michael Simon - initial
+ ******************************************************************************/
+package edu.kit.scc.webreg.entity.identity;
+
+import java.util.Date;
+
+import edu.kit.scc.webreg.entity.AbstractBaseEntity;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+
+@Entity(name = "IdentityEmailAddressEntity")
+@Table(name = "idty_email")
+public class IdentityEmailAddressEntity extends AbstractBaseEntity {
+
+	private static final long serialVersionUID = 1L;
+	
+	@ManyToOne(targetEntity = IdentityEntity.class)
+    @JoinColumn(name = "identity_id", nullable = false)
+	private IdentityEntity identity;
+	
+	@Column(name="email_address", length=2048)
+	private String emailAddress;
+
+	@Column(name = "verified_on")
+	protected Date verifiedOn;
+
+	@Column(name = "valid_until")
+	protected Date validUntil;
+
+	@Column(name = "verification_sent")
+	protected Date verificationSent;
+
+	@Column(name = "verification_token", length=64)
+	protected String verificationToken;
+
+	@Column(name = "token_valid_until")
+	protected Date tokenValidUntil;
+
+	public IdentityEntity getIdentity() {
+		return identity;
+	}
+
+	public void setIdentity(IdentityEntity identity) {
+		this.identity = identity;
+	}
+
+	public String getEmailAddress() {
+		return emailAddress;
+	}
+
+	public void setEmailAddress(String emailAddress) {
+		this.emailAddress = emailAddress;
+	}
+
+	public Date getVerifiedOn() {
+		return verifiedOn;
+	}
+
+	public void setVerifiedOn(Date verifiedOn) {
+		this.verifiedOn = verifiedOn;
+	}
+
+	public Date getVerificationSent() {
+		return verificationSent;
+	}
+
+	public void setVerificationSent(Date verificationSent) {
+		this.verificationSent = verificationSent;
+	}
+
+	public String getVerificationToken() {
+		return verificationToken;
+	}
+
+	public void setVerificationToken(String verificationToken) {
+		this.verificationToken = verificationToken;
+	}
+
+	public Date getValidUntil() {
+		return validUntil;
+	}
+
+	public void setValidUntil(Date validUntil) {
+		this.validUntil = validUntil;
+	}
+
+	public Date getTokenValidUntil() {
+		return tokenValidUntil;
+	}
+
+	public void setTokenValidUntil(Date tokenValidUntil) {
+		this.tokenValidUntil = tokenValidUntil;
+	}
+
+}

bwreg-entities/src/main/java/edu/kit/scc/webreg/entity/identity/IdentityEntity.java

@@ -41,6 +41,13 @@ public class IdentityEntity extends AbstractBaseEntity {
 	@OneToMany(targetEntity=IdentityUserPreferenceEntity.class, mappedBy = "identity")
 	private Set<IdentityUserPreferenceEntity> userPrefs;
 
+	@OneToMany(targetEntity=IdentityEmailAddressEntity.class, mappedBy = "identity")
+	private Set<IdentityEmailAddressEntity> emailAddresses;
+
+	@ManyToOne(targetEntity = IdentityEmailAddressEntity.class)
+    @JoinColumn(name = "email_address_id", nullable = true)
+	private IdentityEmailAddressEntity primaryEmail;
+
 	@ManyToOne(targetEntity = UserEntity.class)
     @JoinColumn(name = "pref_user_id")
 	private UserEntity prefUser;
@@ -128,4 +135,20 @@ public class IdentityEntity extends AbstractBaseEntity {
 	public void setRegistrationLock(Date registrationLock) {
 		this.registrationLock = registrationLock;
 	}
+
+	public Set<IdentityEmailAddressEntity> getEmailAddresses() {
+		return emailAddresses;
+	}
+
+	public void setEmailAddresses(Set<IdentityEmailAddressEntity> emailAddresses) {
+		this.emailAddresses = emailAddresses;
+	}
+
+	public IdentityEmailAddressEntity getPrimaryEmail() {
+		return primaryEmail;
+	}
+
+	public void setPrimaryEmail(IdentityEmailAddressEntity primaryEmail) {
+		this.primaryEmail = primaryEmail;
+	}
 }

bwreg-service/src/main/java/edu/kit/scc/webreg/service/identity/IdentityEmailAddressService.java

+package edu.kit.scc.webreg.service.identity;
+
+import java.io.Serializable;
+import java.math.BigInteger;
+import java.security.SecureRandom;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.slf4j.Logger;
+
+import edu.kit.scc.regapp.mail.api.TemplateMailService;
+import edu.kit.scc.webreg.bootstrap.ApplicationConfig;
+import edu.kit.scc.webreg.dao.BaseDao;
+import edu.kit.scc.webreg.dao.identity.IdentityEmailAddressDao;
+import edu.kit.scc.webreg.entity.EventType;
+import edu.kit.scc.webreg.entity.identity.IdentityEmailAddressEntity;
+import edu.kit.scc.webreg.entity.identity.IdentityEntity;
+import edu.kit.scc.webreg.event.EventSubmitter;
+import edu.kit.scc.webreg.event.IdentityEmailAddressEvent;
+import edu.kit.scc.webreg.event.exc.EventSubmitException;
+import edu.kit.scc.webreg.service.impl.BaseServiceImpl;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.TransactionManagement;
+import jakarta.ejb.TransactionManagementType;
+import jakarta.inject.Inject;
+import jakarta.mail.internet.AddressException;
+import jakarta.mail.internet.InternetAddress;
+
+@Stateless
+@TransactionManagement(TransactionManagementType.BEAN)
+public class IdentityEmailAddressService extends BaseServiceImpl<IdentityEmailAddressEntity> implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@Inject
+	private Logger logger;
+
+	@Inject
+	private IdentityEmailAddressDao dao;
+
+	@Inject
+	private ApplicationConfig appConfig;
+
+	@Inject
+	private TemplateMailService mailService;
+
+	@Inject
+	private EventSubmitter eventSubmitter;
+
+	public IdentityEmailAddressEntity addEmailAddress(IdentityEntity identity, String emailAddress, String executor) throws AddressException {
+		InternetAddress email = new InternetAddress(emailAddress, true);
+
+		IdentityEmailAddressEntity entity = dao.createNew();
+		entity.setIdentity(identity);
+		entity.setEmailAddress(email.getAddress());
+		entity.setVerificationToken(generateToken());
+		entity.setTokenValidUntil(generateTokenValidity());
+		entity = dao.persist(entity);
+
+		sendVerificationEmail(entity);
+
+		IdentityEmailAddressEvent event = new IdentityEmailAddressEvent(entity);
+		try {
+			eventSubmitter.submit(event, EventType.EMAIL_ADDRESS_ADDED, executor);
+		} catch (EventSubmitException e) {
+			logger.warn("Could not submit event", e);
+		}
+
+		return entity;
+	}
+
+	public void redoVerification(IdentityEmailAddressEntity entity, String executor) {
+		entity = dao.fetch(entity.getId());
+
+		entity.setVerificationToken(generateToken());
+		entity.setTokenValidUntil(generateTokenValidity());
+
+		sendVerificationEmail(entity);
+
+		IdentityEmailAddressEvent event = new IdentityEmailAddressEvent(entity);
+		try {
+			eventSubmitter.submit(event, EventType.EMAIL_ADDRESS_REDO_VERIFICATION, executor);
+		} catch (EventSubmitException e) {
+			logger.warn("Could not submit event", e);
+		}
+	}
+
+	public boolean checkVerification(IdentityEmailAddressEntity entity, String token, String executor) {
+		entity = dao.fetch(entity.getId());
+		if (entity.getVerificationToken().equals(token)) {
+			entity.setVerificationToken(null);
+			entity.setVerifiedOn(new Date());
+			entity.setValidUntil(generateValidity());
+
+			IdentityEmailAddressEvent event = new IdentityEmailAddressEvent(entity);
+			try {
+				eventSubmitter.submit(event, EventType.EMAIL_ADDRESS_VERIFIED, executor);
+			} catch (EventSubmitException e) {
+				logger.warn("Could not submit event", e);
+			}
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	private String generateToken() {
+		SecureRandom random = new SecureRandom();
+		String t = new BigInteger(130, random).toString(32);
+		return t;
+	}
+
+	private Date generateTokenValidity() {
+		Long validity = 30 * 60 * 60 * 1000L;
+		if (appConfig.getConfigValue("email_token_validity") != null) {
+			validity = Long.parseLong(appConfig.getConfigValue("email_token_validity"));
+		}
+
+		return new Date(System.currentTimeMillis() + validity);
+	}
+
+	private Date generateValidity() {
+		Long validity = 180 * 24 * 60 * 60 * 1000L;
+		if (appConfig.getConfigValue("email_validity") != null) {
+			validity = Long.parseLong(appConfig.getConfigValue("email_validity"));
+		}
+
+		return new Date(System.currentTimeMillis() + validity);
+	}
+
+	public void sendVerificationEmail(IdentityEmailAddressEntity emailAddress) {
+
+		logger.debug("Sending Email verification mail for identity {} (email: {})", emailAddress.getIdentity().getId(),
+				emailAddress.getEmailAddress());
+
+		String templateName = appConfig.getConfigValueOrDefault("email_verification_template", "email_verification");
+
+		Map<String, Object> context = new HashMap<String, Object>(3);
+		context.put("emailAddress", emailAddress);
+		context.put("identity", emailAddress.getIdentity());
+
+		mailService.sendMail(templateName, context, true);
+		emailAddress.setVerificationSent(new Date());
+	}
+
+	@Override
+	protected BaseDao<IdentityEmailAddressEntity> getDao() {
+		return dao;
+	}
+}

bwreg-webapp/src/main/java/edu/kit/scc/webreg/bean/EmailAddressesBean.java

+/*******************************************************************************
+ * Copyright (c) 2014 Michael Simon.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ * 
+ * Contributors:
+ *     Michael Simon - initial
+ ******************************************************************************/
+package edu.kit.scc.webreg.bean;
+
+import java.io.Serializable;
+
+import edu.kit.scc.webreg.entity.identity.IdentityEntity;
+import edu.kit.scc.webreg.entity.identity.IdentityEntity_;
+import edu.kit.scc.webreg.service.identity.IdentityEmailAddressService;
+import edu.kit.scc.webreg.service.identity.IdentityService;
+import edu.kit.scc.webreg.session.SessionManager;
+import edu.kit.scc.webreg.util.FacesMessageGenerator;
+import jakarta.faces.event.ComponentSystemEvent;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.mail.internet.AddressException;
+
+@Named
+@ViewScoped
+public class EmailAddressesBean implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@Inject
+	private SessionManager session;
+
+	@Inject
+	private IdentityService identityService;
+
+	@Inject
+	private IdentityEmailAddressService service;
+
+	@Inject
+	private FacesMessageGenerator messageGenerator;
+
+	private IdentityEntity identity;
+
+	private String addEmailAddress;
+
+	public void preRenderView(ComponentSystemEvent ev) {
+	}
+
+	public void addEmailAddress() {
+		try {
+			service.addEmailAddress(getIdentity(), addEmailAddress, "idty-" + session.getIdentityId());
+			setAddEmailAddress(null);
+			identity = null;
+		} catch (AddressException e) {
+			messageGenerator.addErrorMessage("Ein Fehler ist aufgetreten", e.toString());
+		}
+	}
+
+	public IdentityEntity getIdentity() {
+		if (identity == null) {
+			identity = identityService.findByIdWithAttrs(session.getIdentityId(), IdentityEntity_.emailAddresses);
+		}
+		return identity;
+	}
+
+	public String getAddEmailAddress() {
+		return addEmailAddress;
+	}
+
+	public void setAddEmailAddress(String addEmailAddress) {
+		this.addEmailAddress = addEmailAddress;
+	}
+}

bwreg-webapp/src/main/webapp/user/email-addresses.xhtml

+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:f="jakarta.faces.core"
+	xmlns:h="jakarta.faces.html"
+	xmlns:ui="jakarta.faces.facelets"
+	xmlns:bw="http://www.scc.kit.edu/bwfacelets"
+	xmlns:p="http://primefaces.org/ui"
+	xmlns:of="http://omnifaces.org/functions">
+<head>
+<title></title>
+</head>
+<body>
+
+<f:view>
+<f:metadata>
+	<f:event type="jakarta.faces.event.PreRenderViewEvent"
+           listener="#{emailAddressesBean.preRenderView}" />
+</f:metadata>
+
+<ui:composition template="/template/default.xhtml">
+	<ui:param name="title" value="#{messages.title}"/>
+
+	<ui:define name="content">
+	<h:form id="form" prependId="false" class="full">
+	
+		<h3><h:outputText value="#{messages['email_addresses.heading']}"/></h3>
+
+		<div><p:messages showDetail="true" /></div>
+
+		<div>
+			<h:outputText value="#{messages['email_addresses.primary_email']}: "/>
+			<h:outputText value="#{emailAddressesBean.identity.primaryEmail}" rendered="#{emailAddressesBean.identity.primaryEmail != null}"/>
+			<h:outputText value="#{messages['email_addresses.no_primary_email_set']}" rendered="#{emailAddressesBean.identity.primaryEmail == null}"/>
+		</div>
+
+		<ui:repeat var="email" value="#{emailAddressesBean.identity.emailAddresses}">
+			<div><h:outputText value="#{email.emailAddress}" /></div>
+		</ui:repeat>
+	
+		<div class="text full" style="margin-top: 0.4em;">
+			<a href="../index.xhtml"><h:outputText value="#{messages.back}"/></a>
+		</div>		
+	</h:form>
+	</ui:define>
+</ui:composition>
+</f:view>
+</body>
+</html>

bwreg-webapp/src/main/webapp/welcome/index.xhtml

@@ -23,43 +23,42 @@
 
 	<ui:define name="content">
 
-	<h:form id="form" prependId="false" class="full form">
+	<h:form id="form" prependId="false" class="full">
 		<h3><h:outputText value="#{messages.welcome}"/></h3>
 
-		<p:panel>
+		<div>
 			<p:panel rendered="#{sessionManager.originalRequestPath != null and sessionManager.originalRequestPath.startsWith('/idp-debug-login/')}">
 				<span class="text-danger">Login debugging is on. You will see a full log of your login process.</span>
 			</p:panel>
 		
-			<p:outputPanel rendered="#{empty discoveryLoginBean.spMetadata and empty discoveryLoginBean.clientConfig}">
+			<h:panelGroup rendered="#{empty discoveryLoginBean.spMetadata and empty discoveryLoginBean.clientConfig}">
 				<h:outputText value="#{messages.welcome_disco}" escape="false"/>
-			</p:outputPanel>
+			</h:panelGroup>
 			
-			<p:outputPanel rendered="#{not empty discoveryLoginBean.spMetadata}">
+			<h:panelGroup rendered="#{not empty discoveryLoginBean.spMetadata}">
 				<h:outputText value="#{messages.welcome_redirected}" /><br/>
 				<b>
 					<h:outputText value="#{discoveryLoginBean.spMetadata.displayName}" rendered="#{not empty discoveryLoginBean.spMetadata.displayName}" />
 					<h:outputText value="#{discoveryLoginBean.spMetadata.entityId}" rendered="#{empty discoveryLoginBean.spMetadata.displayName}" />
 				</b>			
-			</p:outputPanel>
+			</h:panelGroup>
 
-			<p:outputPanel rendered="#{not empty discoveryLoginBean.clientConfig}">
+			<h:panelGroup rendered="#{not empty discoveryLoginBean.clientConfig}">
 				<h:outputText value="#{messages.welcome_redirected}" /><br/> 
 				<b> 
 					<h:outputText value="#{discoveryLoginBean.clientConfig.displayName}" rendered="#{not empty discoveryLoginBean.clientConfig.displayName}" />
 					<h:outputText value="#{discoveryLoginBean.clientConfig.name}" rendered="#{empty discoveryLoginBean.clientConfig.displayName}" />
 				</b>
-			</p:outputPanel>
-		</p:panel>
+			</h:panelGroup>
+		</div>
 		
-		<p:panel>
 
 			<div><p:messages showDetail="true" /></div>
 
 
 			<div class="grid">
 				<div style="margin-top: 1em;" class="col-12 xs:col-12 sm:col-12 md:col-6 lg:col-6 xl:col-6">
-					<p:outputPanel rendered="#{discoveryLoginBean.largeList}">
+					<h:panelGroup rendered="#{discoveryLoginBean.largeList}">
 						<p:focus conext="baseData" for="searchAutocompl" />
 						<span class="ui-float-label">
 			                <p:autoComplete id="searchAutocompl" multiple="false" value="#{discoveryLoginBean.selected}" converter="#{userProvisionerCachedEntryConverter}" 
@@ -72,30 +71,30 @@
 							</p:autoComplete>
 							<p:outputLabel for="@previous" value="#{messages['search_filter']}" />
 						</span>
-					</p:outputPanel>
-					<p:outputPanel rendered="#{not discoveryLoginBean.largeList}">
+					</h:panelGroup>
+					<h:panelGroup rendered="#{not discoveryLoginBean.largeList}">
 						<p:focus conext="baseData" for="selectBox" />
 						<p:selectOneListbox id="selectBox" style="width: 100%;" value="#{discoveryLoginBean.selected}" converter="#{userProvisionerCachedEntryConverter}"
 								filter="true" filterMatchMode="contains" filterNormalize="true">
 							<f:selectItems value="#{discoveryLoginBean.allList}" var="idp" itemLabel="#{idp.displayName}" itemValue="#{idp}"/>
 							<p:ajax update=":form:infoPnl,:form:btnPanel" />
 						</p:selectOneListbox>
-					</p:outputPanel>
-					<p:outputPanel style="margin-top: 1em;">
+					</h:panelGroup>
+					<h:panelGroup style="margin-top: 1em;">
 						<p:selectBooleanCheckbox value="#{discoveryLoginBean.storeIdpSelection}" itemLabel="#{messages.store_idp_selection}" />
-					</p:outputPanel>
+					</h:panelGroup>
 				</div>
 				<div style="margin-top: 0em;" class="col-12 xs:col-12 sm:col-12 md:col-6 lg:col-6 xl:col-6">
 				</div>
 				<div style="margin-top: 0em;" class="col-12 xs:col-6 sm:col-6 md:col-3 lg:col-3 xl:col-3">
-					<p:outputPanel id="btnPanel">
+					<h:panelGroup id="btnPanel" style="block" styleClass="form">
 						<p:commandButton id="login" style="width:100%;" action="#{discoveryLoginBean.login}" value="#{messages.proceed}" disabled="#{empty discoveryLoginBean.selected}"
 							update=":form" />
-					</p:outputPanel>
+					</h:panelGroup>
 		
 				</div>
 				<div style="margin-top: 0em;" class="col-12 xs:col-6 sm:col-6 md:col-3 lg:col-3 xl:col-3">
-					<p:outputPanel id="infoPnl">
+					<h:panelGroup id="infoPnl">
 						<p:panel style="margin:0.5em;" rendered="#{not empty discoveryLoginBean.selected}">
 							<p:commandLink action="#{discoveryLoginBean.login(discoveryLoginBean.selected.id)}">
 								<div style="text-align: left;">
@@ -103,11 +102,11 @@
 								</div> 
 							</p:commandLink> 
 						</p:panel>
-					</p:outputPanel>
+					</h:panelGroup>
 				</div>
 
 			</div>
-			<p:outputPanel rendered="#{discoveryLoginBean.extraList.size() > 0}">
+			<h:panelGroup rendered="#{discoveryLoginBean.extraList.size() > 0}">
 				<div style="margin-top: 2em;"><h:outputText value="#{messages['discovery.alternatives']}:" /></div>
 				<div style="margin-top: 0.5em;" class="grid">
 					<ui:repeat var="extra" value="#{discoveryLoginBean.extraList}">
@@ -121,8 +120,7 @@
 						</div>
 					</ui:repeat>
 				</div>
-			</p:outputPanel>
-		</p:panel>
+			</h:panelGroup>
 	</h:form>
 	
 	</ui:define>

regapp-event-api/src/main/java/edu/kit/scc/webreg/event/IdentityEmailAddressEvent.java

+/*******************************************************************************
+ * Copyright (c) 2014 Michael Simon.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ * 
+ * Contributors:
+ *     Michael Simon - initial
+ ******************************************************************************/
+package edu.kit.scc.webreg.event;
+
+import edu.kit.scc.webreg.entity.audit.AuditEntryEntity;
+import edu.kit.scc.webreg.entity.identity.IdentityEmailAddressEntity;
+
+public class IdentityEmailAddressEvent extends AbstractEvent<IdentityEmailAddressEntity> {
+
+	private static final long serialVersionUID = 1L;
+
+	public IdentityEmailAddressEvent(IdentityEmailAddressEntity entity) {
+		super(entity);
+	}
+
+	public IdentityEmailAddressEvent(IdentityEmailAddressEntity entity, AuditEntryEntity audit) {
+		super(entity, audit);
+	}
+}

regapp-jpa-impl/src/main/java/edu/kit/scc/webreg/dao/identity/IdentityEmailAddressDao.java

+/*******************************************************************************
+ * Copyright (c) 2014 Michael Simon.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ * 
+ * Contributors:
+ *     Michael Simon - initial
+ ******************************************************************************/
+package edu.kit.scc.webreg.dao.identity;
+
+import edu.kit.scc.webreg.dao.jpa.JpaBaseDao;
+import edu.kit.scc.webreg.entity.identity.IdentityEmailAddressEntity;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Named;
+
+@Named
+@ApplicationScoped
+public class IdentityEmailAddressDao extends JpaBaseDao<IdentityEmailAddressEntity> {
+
+	@Override
+	public Class<IdentityEmailAddressEntity> getEntityClass() {
+		return IdentityEmailAddressEntity.class;
+	}
+}