Merge pull request #1 from pdurbin/2170-confirm-email

deployable, table works
bsilverstein95 · Jul 8, 2016 · c263d0e · c263d0e
2 parents 2d6ba01 + a0a0c07
commit c263d0e
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 2 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/AbstractApiBean.java b/src/main/java/edu/harvard/iq/dataverse/api/AbstractApiBean.java
@@ -21,6 +21,7 @@
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
 import edu.harvard.iq.dataverse.authorization.users.GuestUser;
 import edu.harvard.iq.dataverse.authorization.users.User;
+import edu.harvard.iq.dataverse.confirmemail.ConfirmEmailServiceBean;
 import edu.harvard.iq.dataverse.engine.command.Command;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
@@ -169,6 +170,9 @@ String getWrappedMessageWhenJson() {
     @EJB
     protected SavedSearchServiceBean savedSearchSvc;
 
+    @EJB
+    protected ConfirmEmailServiceBean confirmEmailSvc;
+
 	@PersistenceContext(unitName = "VDCNet-ejbPU")
 	protected EntityManager em;
 

diff --git a/src/main/java/edu/harvard/iq/dataverse/api/BuiltinUsers.java b/src/main/java/edu/harvard/iq/dataverse/api/BuiltinUsers.java
@@ -8,6 +8,7 @@
 import edu.harvard.iq.dataverse.authorization.providers.builtin.PasswordEncryption;
 import edu.harvard.iq.dataverse.authorization.users.ApiToken;
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.confirmemail.ConfirmEmailData;
 import edu.harvard.iq.dataverse.util.json.JsonPrinter;
 import java.sql.Timestamp;
 import java.util.Calendar;
@@ -134,10 +135,18 @@ private Response internalSave(BuiltinUser user, String password, String key) {
             token.setExpireTime(new Timestamp(c.getTimeInMillis()));
             authSvc.save(token);
 
+            ConfirmEmailData confirmEmailData = confirmEmailSvc.createToken(au);
+
             JsonObjectBuilder resp = Json.createObjectBuilder();
             resp.add("user", json(user));
             resp.add("authenticatedUser", jsonForAuthUser(au));
             resp.add("apiToken", token.getTokenString());
+            /**
+             * @todo Remove this once a superuser can retrieve the token via the
+             * admin API. We don't want users to get the confirm email token
+             * except via email.
+             */
+            resp.add("confirmEmailToken", confirmEmailData.getToken());
 
             alr.setInfo("builtinUser:" + user.getUserName() + " authenticatedUser:" + au.getIdentifier() );
             return okResponse(resp);

diff --git a/src/main/java/edu/harvard/iq/dataverse/confirmemail/ConfirmEmailData.java b/src/main/java/edu/harvard/iq/dataverse/confirmemail/ConfirmEmailData.java
@@ -105,5 +105,14 @@ public Long getId() {
     public void setId(Long id) {
         this.id = id;
     }
-
+
+    /**
+     * This is only here because it has to be: "The class should have a no-arg,
+     * public or protected constructor." Please use the constructor that takes
+     * arguments.
+     */
+    @Deprecated
+    public ConfirmEmailData() {
+    }
+
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/confirmemail/ConfirmEmailPage.java b/src/main/java/edu/harvard/iq/dataverse/confirmemail/ConfirmEmailPage.java
@@ -27,7 +27,7 @@
  */
 
 @ViewScoped
-@Named("PasswordResetPage")
+@Named("ConfirmEmailPage")
 public class ConfirmEmailPage implements java.io.Serializable {
 
     private static final Logger logger = Logger.getLogger(ConfirmEmailPage.class.getCanonicalName());

diff --git a/src/main/java/edu/harvard/iq/dataverse/confirmemail/ConfirmEmailServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/confirmemail/ConfirmEmailServiceBean.java
@@ -9,6 +9,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.ejb.EJB;
+import javax.ejb.Stateless;
 import javax.persistence.EntityManager;
 import javax.persistence.NoResultException;
 import javax.persistence.NonUniqueResultException;
@@ -19,6 +20,7 @@
  * 
  * @author bsilverstein
  */
+@Stateless
 public class ConfirmEmailServiceBean {
 
     private static final Logger logger = Logger.getLogger(ConfirmEmailServiceBean.class.getCanonicalName());
@@ -212,5 +214,11 @@ private boolean deleteToken(String token) {
             return false;
         }
     }
+
+    public ConfirmEmailData createToken(AuthenticatedUser au) {
+        ConfirmEmailData confirmEmailData = new ConfirmEmailData(au);
+        em.persist(confirmEmailData);
+        return confirmEmailData;
+    }
 
 }