diff --git a/src/main/java/org/ntlab/acanthus_server/entities/AccountTokenJson.java b/src/main/java/org/ntlab/acanthus_server/entities/AccountTokenJson.java deleted file mode 100644 index 06f0fc9..0000000 --- a/src/main/java/org/ntlab/acanthus_server/entities/AccountTokenJson.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.ntlab.acanthus_server.entities; - -import com.fasterxml.jackson.annotation.JsonProperty; - -//----------------------------------------------------------------- -// アカウントのトークンを表示するJson -public class AccountTokenJson { - @JsonProperty("token") - private String token; - - //----------------------------------------------------------------- - //----------------------------------------------------------------- - public AccountTokenJson(Account account){ - this.token = account.getToken(); - } -} diff --git a/src/main/java/org/ntlab/acanthus_server/entities/LoginResponseJson.java b/src/main/java/org/ntlab/acanthus_server/entities/LoginResponseJson.java new file mode 100644 index 0000000..bc03bc3 --- /dev/null +++ b/src/main/java/org/ntlab/acanthus_server/entities/LoginResponseJson.java @@ -0,0 +1,20 @@ +package org.ntlab.acanthus_server.entities; + +import com.fasterxml.jackson.annotation.JsonProperty; + +//----------------------------------------------------------------- +// アカウントのトークンを表示するJson +public class LoginResponseJson { + @JsonProperty("uid") + private Integer uid; + @JsonProperty("token") + private String token; + + //----------------------------------------------------------------- + //----------------------------------------------------------------- + public LoginResponseJson(Account account) { + this.uid = account.getUid(); + this.token = account.getToken(); + } + //----------------------------------------------------------------- +} diff --git a/src/main/java/org/ntlab/acanthus_server/resources/accounts/LoginRest.java b/src/main/java/org/ntlab/acanthus_server/resources/accounts/LoginRest.java index fcc288c..d47c361 100644 --- a/src/main/java/org/ntlab/acanthus_server/resources/accounts/LoginRest.java +++ b/src/main/java/org/ntlab/acanthus_server/resources/accounts/LoginRest.java @@ -1,17 +1,12 @@ package org.ntlab.acanthus_server.resources.accounts; -import org.glassfish.jersey.spi.Contract; -import org.ntlab.acanthus_server.entities.AccountTokenJson; +import org.ntlab.acanthus_server.entities.LoginResponseJson; import org.ntlab.acanthus_server.models.Accounts; -import org.springframework.lang.NonNull; import org.springframework.stereotype.Component; -import javax.validation.constraints.NotNull; import javax.ws.rs.*; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; -import java.util.ResourceBundle; @Component @Path("/accounts/login") @@ -55,7 +50,7 @@ */ @PUT @Produces(MediaType.APPLICATION_JSON) - public AccountTokenJson issueLoginToken(@FormParam("email") String email, @FormParam("password") String password) { + public LoginResponseJson issueLoginToken(@FormParam("email") String email, @FormParam("password") String password) { var searchAccount = accounts.getAccountByEmail(email); var response = Response.status(Response.Status.NO_CONTENT); @@ -69,7 +64,7 @@ else { // トークンをアカウントに設定 searchAccount.updateToken(); - return new AccountTokenJson(searchAccount); + return new LoginResponseJson(searchAccount); } throw new WebApplicationException(response.build()); }