forked from IQSS/dataverse
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Preliminary api test for email confirmation IQSS#2170
- Loading branch information
1 parent
e29cda9
commit 2d6ba01
Showing
11 changed files
with
344 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -42,7 +42,7 @@ public enum ActionType { | |
|
|
||
| Admin, | ||
|
|
||
| GlobalGroups | ||
| GlobalGroups, AuthenticatedUser | ||
| } | ||
|
|
||
| @Id | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,144 @@ | ||
| <!DOCTYPE html> | ||
| <html xmlns="http://www.w3.org/1999/xhtml" | ||
| xmlns:h="http://java.sun.com/jsf/html" | ||
| xmlns:f="http://java.sun.com/jsf/core" | ||
| xmlns:ui="http://java.sun.com/jsf/facelets" | ||
| xmlns:p="http://primefaces.org/ui" | ||
| xmlns:jsf="http://xmlns.jcp.org/jsf"> | ||
|
|
||
| <h:head> | ||
| </h:head> | ||
|
|
||
| <h:body> | ||
| <ui:composition template="/dataverse_template.xhtml"> | ||
| <ui:param name="pageTitle" value="#{bundle['pageTitle.confirmEmail.pre']} - #{dataverseServiceBean.findRootDataverse().name} #{bundle.dataverse}"/> | ||
| <ui:param name="dataverse" value="#{dataverseServiceBean.findRootDataverse()}"/> | ||
| <ui:param name="showDataverseHeader" value="false"/> | ||
| <ui:param name="loginRedirectPage" value="dataverse.xhtml"/> | ||
| <ui:define name="body"> | ||
| <f:metadata> | ||
| <f:viewParam name="token" value="#{ConfirmEmailPage.token}"/> | ||
| <f:viewAction action="#{ConfirmEmailPage.init}" /> | ||
| </f:metadata> | ||
|
|
||
| <ui:fragment id="debugVariables" rendered="false"> | ||
| <div style="background-color: lightgray; margin-top:3em;"> | ||
| <tt> | ||
| <h:outputText value="#{bundle['confirmEmail.token']} #{ConfirmEmailPage.token}"/><br/> | ||
| <h:outputText value="#{bundle['confirmEmail.userLookedUp']} #{ConfirmEmailPage.user.userName}"/><br/> | ||
| <h:outputText value="#{bundle['confirmEmail.emailSubmitted']} #{ConfirmEmailPage.emailAddress}"/><br/> | ||
| </tt> | ||
| </div> | ||
| </ui:fragment> | ||
|
|
||
| <ui:fragment rendered="#{empty ConfirmEmailPage.token}"> | ||
| <div jsf:rendered="#{empty ConfirmEmailPage.emailAddress}"> | ||
| <div class="alert alert-info"> | ||
| <span class="glyphicon glyphicon-info-sign"></span> | ||
| <h:outputFormat value="#{bundle['confirmEmail.details']}" escape="false"> | ||
| <f:param value="<strong>"/> | ||
| <f:param value="</strong>"/> | ||
| </h:outputFormat> | ||
| </div> | ||
| <h:form id="confirmEmail" styleClass="form-horizontal"> | ||
| <div class="form-group col-sm-11"> | ||
| <p:outputLabel value="#{bundle.email}" for="email" styleClass="col-sm-3 control-label"/> | ||
| <div class="col-sm-4"> | ||
| <p:inputText id="email" value="#{ConfirmEmailPage.emailAddress}" styleClass="form-control"/> | ||
| <p:watermark for="email" value="[email protected]"/> | ||
| <p:focus context="confirmEmail"/> | ||
| <p:message for="email" display="text" /> | ||
| </div> | ||
| </div> | ||
| <div class="form-group col-sm-11"> | ||
| <div class="col-sm-offset-3 col-sm-9 button-block"> | ||
| <p:commandButton action="#{ConfirmEmailPage.sendEmailConfirmLink()}" update="@all" value="#{bundle['confirmEmail.submitRequest']}"/> | ||
| <p:button value="#{bundle.cancel}" outcome="/loginpage.xhtml"/> | ||
| </div> | ||
| </div> | ||
| </h:form> | ||
| </div> | ||
| <ui:fragment rendered="#{not empty ConfirmEmailPage.emailAddress}"> | ||
| <h:outputFormat value="#{bundle['confirmEmail.successSubmit.tip']}"> | ||
| <f:param value="#{ConfirmEmailPage.emailAddress}"/> | ||
| </h:outputFormat> | ||
| <ui:fragment id="debugEmail" rendered="false"> | ||
| <div style="background-color: lightgray"> | ||
| <tt> | ||
| <h:outputText value="#{bundle['confirmEmail.debug']}"/><br/> | ||
| <ui:fragment rendered="#{not empty ConfirmEmailPage.confirmEmailUrl}"> | ||
| <h:outputText value="#{bundle['confirmEmail.resetUrl']} "/> | ||
| <h:outputLink value="#{ConfirmEmailPage.confirmEmailUrl}"> | ||
| <h:outputText value="#{ConfirmEmailPage.confirmEmailUrl}"/> | ||
| </h:outputLink> | ||
| </ui:fragment> | ||
| <ui:fragment rendered="#{empty ConfirmEmailPage.passwordResetUrl}"> | ||
| <h:outputFormat value="#{bundle['confirmEmail.noEmail.tip']}"> | ||
| <f:param value="#{ConfirmEmailPage.emailAddress}"/> | ||
| </h:outputFormat> | ||
| </ui:fragment> | ||
| </tt> | ||
| </div> | ||
| </ui:fragment> | ||
| </ui:fragment> | ||
| </ui:fragment> | ||
|
|
||
| <ui:fragment rendered="#{not empty ConfirmEmailPage.token}"> | ||
| <h:outputFormat value="#{bundle['confirmEmail.illegalLink.tip']}" escape="false" rendered="#{empty ConfirmEmailPage.user}"> | ||
| <f:param value="<a href='/confirmemail.xhtml'>"/> | ||
| <f:param value="</a>"/> | ||
| </h:outputFormat> | ||
| <ui:fragment rendered="#{not empty ConfirmEmailPage.user}"> | ||
| <div class="alert alert-info"> | ||
| <span class="glyphicon glyphicon-info-sign"></span> | ||
| <!-- <h:outputFormat value="#{bundle['passwdReset.newPasswd.details']}" escape="false"> | ||
| <f:param value="<strong>"/> | ||
| <f:param value="</strong>"/> | ||
| </h:outputFormat>--> | ||
| </div> | ||
| <!-- <div class="row" jsf:rendered="#{ConfirmEmailPage.isAccountUpgrade()}"> | ||
| <div class="col-sm-12"> | ||
| <h:outputFormat styleClass="h2 text-info show" value="#{bundle['user.updatePassword.welcome']}"> | ||
| <f:param value="#{systemConfig.getVersion(true)}"/> | ||
| <f:param value="#{PasswordResetPage.user.displayInfo.title}"/> | ||
| </h:outputFormat> | ||
| <p class="help-block"><span class="text-danger"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['user.updatePassword.warning']}</span></p> | ||
| </div> | ||
| </div>--> | ||
| <!-- <div> | ||
| <h:form styleClass="form-horizontal"> | ||
| <div class="form-group col-sm-11"> | ||
| <label for="inputPassword" class="col-sm-3 control-label"> | ||
| #{bundle['passwdReset.newPasswd']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"></span> | ||
| </label> | ||
| <div class="col-sm-4"> | ||
| <p:password id="inputPassword" label="#{bundle.passwd}" match="retypePassword" styleClass="form-control" value="#{PasswordResetPage.newPassword}"/> | ||
| <p:message for="inputPassword" /> | ||
| </div> | ||
| </div>--> | ||
| <!-- <div class="form-group col-sm-11"> | ||
| <label for="retypePassword" class="col-sm-3 control-label"> | ||
| #{bundle['passwdReset.rePasswd']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"></span> | ||
| </label> | ||
| <div class="col-sm-4"> | ||
| <p:password id="retypePassword" label="#{bundle['passwdReset.rePasswd']}" styleClass="form-control" value="#{PasswordResetPage.newPassword}"/> | ||
| <p:message for="retypePassword" /> | ||
| </div> | ||
| </div> | ||
| <ui:fragment rendered="#{PasswordResetPage.isAccountUpgrade()}"> | ||
| Terms of Use | ||
| <ui:include src="termsofuse.xhtml"/> | ||
| </ui:fragment> | ||
| <div class="form-group col-sm-11"> | ||
| <div class="col-sm-10 button-block"> | ||
| <p:commandButton action="#{PasswordResetPage.resetPassword()}" update="@all" value="#{bundle['passwdReset.resetBtn']}"/> | ||
| </div> | ||
| </div>--> | ||
| </h:form> | ||
| </div> | ||
| </ui:fragment> | ||
| </ui:fragment> | ||
| </ui:define> | ||
| </ui:composition> | ||
| </h:body> | ||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.