3438 email verification 0121

src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/DataverseUserPage.java

@@ -540,17 +540,13 @@ public void sendConfirmEmail() {
     }
 
 
-    /**
-     * Determines whether the button to send a verification email appears on user page
-     * TODO: cant this be refactored to use confirmEmailService.hasVerifiedEmail(currentUser) ?
-     * @return 
-     */ 
     public boolean showVerifyEmailButton() {
-        final Timestamp emailConfirmed = currentUser.getEmailConfirmed();
-        final ConfirmEmailData confirmedDate = confirmEmailService.findSingleConfirmEmailDataByUser(currentUser);
-        return (!getUserAuthProvider().isEmailVerified())
-                && confirmedDate == null
-                && emailConfirmed == null;
+        return !confirmEmailService.hasVerifiedEmail(currentUser);
+    }
+
+    public boolean getHasActiveVerificationToken(){
+        //for user page to determine how to handle Confirm Email click
+        return confirmEmailService.hasActiveVerificationToken(currentUser);
     }
 
     public boolean isEmailIsVerified() {

src/main/java/edu/harvard/iq/dataverse/confirmemail/ConfirmEmailServiceBean.java

@@ -205,6 +205,14 @@ public ConfirmEmailData findSingleConfirmEmailDataByUser(AuthenticatedUser user)
         }
         return confirmEmailData;
     }
+
+    public boolean hasActiveVerificationToken(AuthenticatedUser au) {
+        if (findSingleConfirmEmailDataByUser(au) == null){
+            return false;
+        }
+        return !findSingleConfirmEmailDataByUser(au).isExpired();
+    }
+
 
     public List<ConfirmEmailData> findAllConfirmEmailData() {
         TypedQuery<ConfirmEmailData> typedQuery = em.createNamedQuery("ConfirmEmailData.findAll", ConfirmEmailData.class);

src/main/java/propertyFiles/Bundle.properties

@@ -160,6 +160,8 @@ institution.name=A Dataverse Instance
 account.info=Account Information
 account.edit=Edit Account
 account.apiToken=API Token
+account.emailvalidation.header=Email Validation
+account.emailvalidation.token.exists=A verification email has been sent to {0}. Please check your inbox.
 user.isShibUser=Account information cannot be edited when logged in through an institutional account.
 user.helpShibUserMigrateOffShibBeforeLink=Leaving your institution? Please contact
 user.helpShibUserMigrateOffShibAfterLink=for assistance.