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 api (#303)

Browse Source
This commit is contained in:
Athou
2013-06-18 12:31:09 +02:00
parent 2515bf9ec7
commit e90425778f
6 changed files with 67 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/commafeed/frontend/rest/resources/AdminREST.java
View File

@@ -52,7 +52,7 @@ public class AdminREST extends AbstractResourceREST {
}
User user = userService.register(userModel.getName(),
userModel.getPassword(), roles);
userModel.getPassword(), userModel.getEmail(), roles);
if (user == null) {
return Response.status(Status.CONFLICT)
.entity("User already exists.").build();

18
src/main/java/com/commafeed/frontend/rest/resources/UserREST.java
View File

@@ -1,5 +1,7 @@
package com.commafeed.frontend.rest.resources;
import java.util.Arrays;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
@@ -19,6 +21,7 @@ import com.commafeed.backend.model.UserSettings.ViewMode;
import com.commafeed.frontend.model.Settings;
import com.commafeed.frontend.model.UserModel;
import com.commafeed.frontend.model.request.ProfileModificationRequest;
import com.commafeed.frontend.model.request.RegistrationRequest;
import com.google.common.base.Preconditions;
import com.wordnik.swagger.annotations.Api;
import com.wordnik.swagger.annotations.ApiOperation;
@@ -138,6 +141,21 @@ public class UserREST extends AbstractResourceREST {
return Response.ok().build();
}
@Path("/register")
@POST
@ApiOperation(value = "Register a new account")
public Response register(@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();
}
}
@Path("/profile/deleteAccount")
@POST
@ApiOperation(value = "Delete the user account")