diff --git a/src/main/java/cactusServer/entities/Account.java b/src/main/java/cactusServer/entities/Account.java index 360ca81..eb2d7ae 100644 --- a/src/main/java/cactusServer/entities/Account.java +++ b/src/main/java/cactusServer/entities/Account.java @@ -43,10 +43,11 @@ token = RandomStringUtils.random(64, "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"); return token; } + public Account getAccount(String token) { - if(this.token == token) { + if (this.token == token) { return this; - }else { + } else { return null; } } diff --git a/src/main/java/cactusServer/resources/AccountsRest.java b/src/main/java/cactusServer/resources/AccountsRest.java index 453a9bf..d9dd2d1 100644 --- a/src/main/java/cactusServer/resources/AccountsRest.java +++ b/src/main/java/cactusServer/resources/AccountsRest.java @@ -6,10 +6,9 @@ import cactusServer.entities.Account; import cactusServer.models.Accounts; -@Path("/AccountsRest") +@Path("/accounts") public class AccountsRest { - @POST - @Path("/login") + @PUT @Produces(MediaType.APPLICATION_JSON) public Account loginAccount(@FormParam("userID") String userID, @FormParam("userPass") String userPass) { return Accounts.getInstance().loginAccount(userID, userPass); @@ -23,21 +22,12 @@ } @POST - @Path("/createAccount") @Produces(MediaType.APPLICATION_JSON) public Account create(@FormParam("userID") String userID, @FormParam("userName") String userName, @FormParam("userPass") String userPass) { return Accounts.getInstance().createAcount(userID, userName, userPass); } - @PUT - @Path("/updateAccount") - @Produces(MediaType.APPLICATION_JSON) - public Account updateAccount(@FormParam("userID") String userID, @FormParam("userName") String userName, - @FormParam("userPass") String userPass) { - return Accounts.getInstance().updateAccount(userID, userName, userPass); - } - @GET @Path("/{userID}") @Produces(MediaType.APPLICATION_JSON) @@ -45,10 +35,4 @@ return Accounts.getInstance().getAccount(userID); } - @DELETE - @Path("/deleteAccount") - @Produces(MediaType.TEXT_PLAIN) - public String deleteAccount(@FormParam("userID") String userID) { - return Accounts.getInstance().deleteAccount(userID); - } }