diff --git a/src/main/java/org/ntlab/nemophila/models/accounts/Account.java b/src/main/java/org/ntlab/nemophila/models/accounts/Account.java index ca18979..c55cb6d 100644 --- a/src/main/java/org/ntlab/nemophila/models/accounts/Account.java +++ b/src/main/java/org/ntlab/nemophila/models/accounts/Account.java @@ -1,5 +1,6 @@ package org.ntlab.nemophila.models.accounts; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import org.ntlab.nemophila.models.shops.Shop; @@ -13,6 +14,7 @@ @JsonProperty("id") private String id; + @JsonIgnore private String pw; @JsonProperty("token") private String token; diff --git a/src/main/java/org/ntlab/nemophila/resources/accounts/AccountsRest.java b/src/main/java/org/ntlab/nemophila/resources/accounts/AccountsRest.java index 846248c..004bd91 100644 --- a/src/main/java/org/ntlab/nemophila/resources/accounts/AccountsRest.java +++ b/src/main/java/org/ntlab/nemophila/resources/accounts/AccountsRest.java @@ -1,16 +1,20 @@ package org.ntlab.nemophila.resources.accounts; +import org.ntlab.nemophila.models.accounts.Account; +import org.ntlab.nemophila.models.accounts.AccountManager; import org.springframework.stereotype.Component; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import javax.ws.rs.*; +import javax.ws.rs.core.MediaType; @Component @Path("/accounts") public class AccountsRest { @POST - public String getAccounts() { - return null; + public Account createAccount(@FormParam("name") String name, @FormParam("pw") String pw) { + AccountManager am = AccountManager.getInstance(); + Account new_account = createAccount(name,pw); + + return new_account; } }