Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

registration module

Browse Source
This commit is contained in:
Athou
2014-08-09 19:04:37 +02:00
parent 0c25412f03
commit 0329c7d876
6 changed files with 65 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/commafeed/CommaFeedApplication.java
View File

@@ -201,9 +201,7 @@ public class CommaFeedApplication extends Application<CommaFeedConfiguration> {
environment.lifecycle().manage(feedWorker);
environment.lifecycle().manage(feedUpdater);
// TODO user login + registration page
// TODO translations
}
public static void main(String[] args) throws Exception {

10
src/main/java/com/commafeed/frontend/model/request/RegistrationRequest.java
View File

@@ -4,6 +4,10 @@ import java.io.Serializable;
import lombok.Data;
import org.hibernate.validator.constraints.Email;
import org.hibernate.validator.constraints.Length;
import org.hibernate.validator.constraints.NotEmpty;
import com.wordnik.swagger.annotations.ApiModel;
import com.wordnik.swagger.annotations.ApiModelProperty;
@@ -13,12 +17,18 @@ import com.wordnik.swagger.annotations.ApiModelProperty;
public class RegistrationRequest implements Serializable {
@ApiModelProperty(value = "username, between 3 and 32 characters", required = true)
@Length(min = 3, max = 32)
@NotEmpty
private String name;
@ApiModelProperty(value = "password, minimum 6 characters", required = true)
@Length(min = 6)
@NotEmpty
private String password;
@ApiModelProperty(value = "email address for password recovery", required = true)
@Email
@NotEmpty
private String email;
}

16
src/main/java/com/commafeed/frontend/resource/UserREST.java
View File

@@ -2,10 +2,14 @@ package com.commafeed.frontend.resource;
import io.dropwizard.hibernate.UnitOfWork;
import io.dropwizard.jersey.sessions.Session;
import io.dropwizard.jersey.validation.ValidationErrorMessage;
import java.util.Arrays;
import java.util.Collections;
import javax.servlet.http.HttpSession;
import javax.validation.ConstraintViolation;
import javax.validation.Valid;
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
@@ -40,6 +44,7 @@ import com.commafeed.frontend.model.request.ProfileModificationRequest;
import com.commafeed.frontend.model.request.RegistrationRequest;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.wordnik.swagger.annotations.Api;
import com.wordnik.swagger.annotations.ApiOperation;
import com.wordnik.swagger.annotations.ApiParam;
@@ -200,12 +205,17 @@ public class UserREST {
@POST
@UnitOfWork
@ApiOperation(value = "Register a new account")
public Response register(@ApiParam(required = true) RegistrationRequest req) {
public Response register(@Valid @ApiParam(required = true) RegistrationRequest req) {
try {
userService.register(req.getName(), req.getPassword(), req.getEmail(), Arrays.asList(Role.USER));
return Response.ok().build();
} catch (Exception e) {
return Response.status(Status.INTERNAL_SERVER_ERROR).entity(e.getMessage()).build();
} catch (final IllegalArgumentException e) {
return Response.status(422).entity(new ValidationErrorMessage(Collections.<ConstraintViolation<?>> emptySet()) {
@Override
public ImmutableList<String> getErrors() {
return ImmutableList.of(e.getMessage());
}
}).build();
}
}