diff --git a/src/main/java/org/ntlab/nemophila/resources/accounts/AccountRest.java b/src/main/java/org/ntlab/nemophila/resources/accounts/AccountRest.java index fa35dbf..3545b59 100644 --- a/src/main/java/org/ntlab/nemophila/resources/accounts/AccountRest.java +++ b/src/main/java/org/ntlab/nemophila/resources/accounts/AccountRest.java @@ -14,8 +14,8 @@ //ユーザー情報の取得 @GET - @Produces(MediaType.APPLICATION_JSON) @Path("/{uid}") + @Produces(MediaType.APPLICATION_JSON) public Account getAccount(@PathParam("uid") String uid){ AccountManager am = AccountManager.getInstance(); Account ac = am.getAccount(uid); @@ -32,7 +32,7 @@ //パスワードの変更 @PUT - @Path("/{uid}") + @Path("/{uid}/pw") public void pwChange(@PathParam("uid") String uid, @FormParam("pw") String pw){ AccountManager am = AccountManager.getInstance(); Account ac = am.getAccount(uid); @@ -42,10 +42,10 @@ System.out.println("Error : Miss match pw"); } } - +// //名前の変更 @PUT - @Path("/{uid}") + @Path("/{uid}/name") public void nameChange(@PathParam("uid") String uid, @FormParam("name") String name, @FormParam("token") String token){ AccountManager am = AccountManager.getInstance(); Account ac = am.getAccount(uid); @@ -59,7 +59,7 @@ //アイコンの変更 // @PUT -// @Path("/{uid}") +// @Path("/{uid}/icon") // public void nameChange(@PathParam("uid") String uid, @FormParam("name") String name, @FormParam("token") String token){ // AccountManager am = AccountManager.getInstance(); // Account ac = am.getAccount(uid); @@ -74,7 +74,7 @@ //アイコンの削除 // @DELETE -// @Path("/{uid}") +// @Path("/{uid}/icon") // public String removeAccount(@PathParam("uid") String uid){ // AccountManager am = AccountManager.getInstance(); // Account ac = am.getAccount(uid); diff --git a/src/main/java/org/ntlab/nemophila/resources/accounts/LoginRest.java b/src/main/java/org/ntlab/nemophila/resources/accounts/LoginRest.java index 48e55cf..583e567 100644 --- a/src/main/java/org/ntlab/nemophila/resources/accounts/LoginRest.java +++ b/src/main/java/org/ntlab/nemophila/resources/accounts/LoginRest.java @@ -2,26 +2,27 @@ import org.ntlab.nemophila.models.accounts.Account; import org.ntlab.nemophila.models.accounts.AccountManager; +import org.springframework.stereotype.Component; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import javax.ws.rs.*; +import javax.ws.rs.core.MediaType; - +@Component +@Path("/accounts") public class LoginRest { @POST @Path("/{uid}/login") + @Produces(MediaType.APPLICATION_JSON) public Account getAccounts(@PathParam("uid") String uid, @FormParam("pw") String pw) { AccountManager am = AccountManager.getInstance(); - Account account = am.getAccount(uid); + Account ac = am.getAccount(uid); - if (account.getPw().equals(pw)) { - account = am.updateAccount(uid); + if (ac.getPw().equals(pw)) { + ac = am.updateAccount(uid); } else { System.out.println("Error : Miss match pw"); } - return account; + return ac; } }