Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Apply reformat to changed files.
Browse files Browse the repository at this point in the history
  • Loading branch information
Carlos A. Munoz committed Oct 1, 2013
1 parent e6cb2b4 commit 3c3293c
Show file tree
Hide file tree
Showing 9 changed files with 1,668 additions and 2,183 deletions.
3,178 changes: 1,321 additions & 1,857 deletions zanata-war/pom.xml
View file

Large diffs are not rendered by default.

46 changes: 0 additions & 46 deletions zanata-war/src/main/java/org/zanata/action/BannerAction.java
View file

This file was deleted.

275 changes: 133 additions & 142 deletions zanata-war/src/main/java/org/zanata/action/RegisterAction.java
View file
Expand Up @@ -37,7 +37,6 @@
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.faces.FacesMessages;
import org.jboss.seam.faces.Renderer;
import org.jboss.seam.international.StatusMessage;
import org.jboss.seam.log.Log;
import org.zanata.action.validator.NotDuplicateEmail;
Expand All @@ -48,146 +47,138 @@

@Name("register")
@Scope(ScopeType.CONVERSATION)
public class RegisterAction implements Serializable
{

private static final long serialVersionUID = -7883627570614588182L;

@Logger
Log log;

@In
private EntityManager entityManager;

@In
RegisterService registerServiceImpl;

@In
PersonDAO personDAO;

@In
EmailService emailServiceImpl;

private String username;
private String email;
private String password;
private String humanField;

private boolean valid;

private HPerson person;

@Begin(join = true)
public HPerson getPerson()
{
if (person == null)
person = new HPerson();
return person;
}

public void setUsername(String username)
{
validateUsername(username);
this.username = username;
}

@NotEmpty
@Size(min = 3, max = 20)
@Pattern(regexp = "^[a-z\\d_]{3,20}$", message = "{validation.username.constraints}")
public String getUsername()
{
return username;
}

public void setEmail(String email)
{
this.email = email;
}

@NotEmpty
@Email
@NotDuplicateEmail(message="This email address is already taken.")
public String getEmail()
{
return email;
}

public void setPassword(String password)
{
this.password = password;
}

@NotEmpty
@Size(min = 6, max = 20)
// @Pattern(regex="(?=^.{6,}$)((?=.*\\d)|(?=.*\\W+))(?![.\\n])(?=.*[A-Z])(?=.*[a-z]).*$",
// message="Password is not secure enough!")
public String getPassword()
{
return password;
}

@Size(min = 0, max = 0)
public String getHumanField()
{
return humanField;
}

public void setHumanField(String humanField)
{
this.humanField = humanField;
}

public void validateUsername(String username)
{
try
{
entityManager.createQuery("from HAccount a where a.username = :username").setParameter("username", username).getSingleResult();
valid = false;
FacesMessages.instance().addToControl("username", "This username is not available");
}
catch (NoResultException e)
{
// pass
}
}

public void validateHumanField()
{
if (humanField != null && humanField.length() > 0)
{
valid = false;
FacesMessages.instance().add(StatusMessage.Severity.ERROR, "You have filled a field that was not meant for humans.");
humanField = null;
}

}

@End
public String register()
{
valid = true;
validateUsername(getUsername());
validateHumanField();

if (!isValid())
{
return null;
}
final String user = getUsername();
final String pass = getPassword();
final String email = getEmail();
String key = registerServiceImpl.register(user, pass, getPerson().getName(), email);
log.info("get register key:" + key);

String message = emailServiceImpl.sendActivationEmail(EmailService.ACTIVATION_ACCOUNT_EMAIL_TEMPLATE, user, email, key);
FacesMessages.instance().add(message);

return "/home.xhtml";
}

public boolean isValid()
{
return valid;
}
public class RegisterAction implements Serializable {

private static final long serialVersionUID = -7883627570614588182L;

@Logger
Log log;

@In
private EntityManager entityManager;

@In
RegisterService registerServiceImpl;

@In
PersonDAO personDAO;

@In
EmailService emailServiceImpl;

private String username;
private String email;
private String password;
private String humanField;

private boolean valid;

private HPerson person;

@Begin(join = true)
public HPerson getPerson() {
if (person == null)
person = new HPerson();
return person;
}

public void setUsername(String username) {
validateUsername(username);
this.username = username;
}

@NotEmpty
@Size(min = 3, max = 20)
@Pattern(regexp = "^[a-z\\d_]{3,20}$",
message = "{validation.username.constraints}")
public String getUsername() {
return username;
}

public void setEmail(String email) {
this.email = email;
}

@NotEmpty
@Email
@NotDuplicateEmail(message = "This email address is already taken.")
public String getEmail() {
return email;
}

public void setPassword(String password) {
this.password = password;
}

@NotEmpty
@Size(min = 6, max = 20)
// @Pattern(regex="(?=^.{6,}$)((?=.*\\d)|(?=.*\\W+))(?![.\\n])(?=.*[A-Z])(?=.*[a-z]).*$",
// message="Password is not secure enough!")
public
String getPassword() {
return password;
}

@Size(min = 0, max = 0)
public String getHumanField() {
return humanField;
}

public void setHumanField(String humanField) {
this.humanField = humanField;
}

public void validateUsername(String username) {
try {
entityManager
.createQuery("from HAccount a where a.username = :username")
.setParameter("username", username).getSingleResult();
valid = false;
FacesMessages.instance().addToControl("username",
"This username is not available");
} catch (NoResultException e) {
// pass
}
}

public void validateHumanField() {
if (humanField != null && humanField.length() > 0) {
valid = false;
FacesMessages.instance().add(StatusMessage.Severity.ERROR,
"You have filled a field that was not meant for humans.");
humanField = null;
}

}

@End
public String register() {
valid = true;
validateUsername(getUsername());
validateHumanField();

if (!isValid()) {
return null;
}
final String user = getUsername();
final String pass = getPassword();
final String email = getEmail();
String key =
registerServiceImpl.register(user, pass, getPerson().getName(),
email);
log.info("get register key:" + key);

String message =
emailServiceImpl.sendActivationEmail(
EmailService.ACTIVATION_ACCOUNT_EMAIL_TEMPLATE, user,
email, key);
FacesMessages.instance().add(message);

return "/home.xhtml";
}

public boolean isValid() {
return valid;
}

}
8 changes: 4 additions & 4 deletions zanata-war/src/main/webapp/WEB-INF/layout/field.xhtml
View file
@@ -1,8 +1,8 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:s="http://jboss.org/schema/seam/taglib">
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:s="http://jboss.org/schema/seam/taglib">

<s:validateAll>
<div class="#{invalid ? 'form__item--error' : ''}">
Expand Down
4 changes: 2 additions & 2 deletions zanata-war/src/main/webapp/WEB-INF/pages.xml
View file
Expand Up @@ -101,8 +101,8 @@
<header name="Cache-Control"
value="no-cache, no-store, max-age=0, must-revalidate" />
<param name="continue" value="#{userRedirect.encodedUrl}" />
<action execute="#{breadcrumbs.clear}"/>
<action execute="#{breadcrumbs.addLocation('', messages['jsf.Login'])}"/>
<action execute="#{breadcrumbs.clear}" />
<action execute="#{breadcrumbs.addLocation('', messages['jsf.Login'])}" />
<navigation>
<rule if="#{identity.loggedIn}">
<redirect view-id="/dashboard/home.xhtml" />
Expand Down

0 comments on commit 3c3293c

Please sign in to comment.