rename button to "Send Verification Email", remove popup #8227

IQSS · Apr 5, 2022 · 8b1500c · 8b1500c
1 parent 8c70b7a
commit 8b1500c
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 35 deletions.
diff --git a/doc/release-notes/8227-verify-email.md b/doc/release-notes/8227-verify-email.md
@@ -0,0 +1 @@
+The "Verify Email" button has been changed to "Send Verification Email" and rather than sometimes showing a popup now always sends a fresh verification email (and invalidates previous verification emails).
diff --git a/...main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/DataverseUserPage.java b/...main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/DataverseUserPage.java
@@ -546,11 +546,6 @@ public boolean showVerifyEmailButton() {
         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() {
         return confirmEmailService.hasVerifiedEmail(currentUser);
     }

diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
@@ -183,8 +183,6 @@ contact.context.support.ending=\n\n---\n\nMessage sent from Support contact form
 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.
@@ -364,10 +362,10 @@ authenticationProvider.name.shib=Shibboleth
 
 #confirmemail.xhtml
 confirmEmail.pageTitle=Email Verification
-confirmEmail.submitRequest=Verify Email
+confirmEmail.submitRequest=Send Verification Email
 confirmEmail.submitRequest.success=A verification email has been sent to {0}. Note, the verify link will expire after {1}.
 confirmEmail.details.success=Email address verified!
-confirmEmail.details.failure=We were unable to verify your email address. Please navigate to your Account Information page and click the "Verify Email" button.
+confirmEmail.details.failure=We were unable to verify your email address. Please navigate to your Account Information page and click the "Send Verification Email" button.
 confirmEmail.details.goToAccountPageButton=Go to Account Information
 confirmEmail.notVerified=Not Verified
 confirmEmail.verified=Verified

diff --git a/src/main/webapp/dataverseuser.xhtml b/src/main/webapp/dataverseuser.xhtml
@@ -484,7 +484,6 @@
                                                                 id="verifyEmailButton"
                                                                 action="#{DataverseUserPage.sendConfirmEmail()}"
                                                                 update="@([id$=verifyEmailButton]), :messagePanel"
-                                                                onclick="if (!testHasEmailToken(#{DataverseUserPage.getHasActiveVerificationToken()})) return false;"
                                                                >
                                                     <span class="glyphicon glyphicon-ok"></span> #{bundle['confirmEmail.submitRequest']}
                                                 </p:commandLink>
@@ -754,32 +753,7 @@
                             </div>
                         </p:tab>
                     </p:tabView>
-                        <p:dialog id="tokenExists" styleClass="smallPopUp"
-                                  header="#{bundle['account.emailvalidation.header']}" widgetVar="tokenExists" modal="true">
-
-                             <h:outputFormat value="#{bundle['account.emailvalidation.token.exists']}" escape="false">
-                                <o:param>#{DataverseUserPage.currentUser.email}</o:param>
-                            </h:outputFormat>
-
-
-                            <div class="button-block">
-                                <button class="btn btn-default" onclick="PF('tokenExists').hide();" type="button">
-                                    #{bundle.close}
-                                </button>
-                            </div>
-                        </p:dialog> 
                 </h:form>
-                <script>
-                    //<![CDATA[        
-                        function testHasEmailToken(hasActiveVerificationToken) {
-                            if (hasActiveVerificationToken) {                               
-                                PF("tokenExists").show();
-                            } else {
-                                return true;
-                            }                        
-                        }
-                    //]]>
-                </script>
             </ui:define>
         </ui:composition>
     </h:body>