diff --git a/doc/release-notes/8227-verify-email.md b/doc/release-notes/8227-verify-email.md new file mode 100644 index 00000000000..0f3faa5436a --- /dev/null +++ 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/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/DataverseUserPage.java b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/DataverseUserPage.java index 177c59c5873..1cba16968bf 100644 --- a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/DataverseUserPage.java +++ b/src/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 index 9895cffe0e7..f8c2e5f97ec 100644 --- 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 index cb922a0164d..7fe5c43054f 100644 --- 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;" > #{bundle['confirmEmail.submitRequest']} @@ -754,32 +753,7 @@ - - - - #{DataverseUserPage.currentUser.email} - - - -
- -
-
-