diff --git a/src/main/java/org/ntlab/acanthus_server/models/Accounts.java b/src/main/java/org/ntlab/acanthus_server/models/Accounts.java index 2fb9189..bc762f0 100644 --- a/src/main/java/org/ntlab/acanthus_server/models/Accounts.java +++ b/src/main/java/org/ntlab/acanthus_server/models/Accounts.java @@ -14,12 +14,12 @@ //----------------------------------------------------------------- // インスタンス生成禁止 - private Accounts(){} + private Accounts(){} //----------------------------------------------------------------- // シングルトン取得 //----------------------------------------------------------------- - public Accounts getInstance(){ + public static Accounts getInstance(){ if(_theInstance == null) _theInstance = new Accounts(); return _theInstance; } 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 f795b50..c06eb49 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,18 +1,41 @@ package org.ntlab.acanthus_server.resources.accounts; +import org.ntlab.acanthus_server.entities.Account; +import org.ntlab.acanthus_server.models.Accounts; import org.springframework.stereotype.Component; import javax.ws.rs.GET; import javax.ws.rs.PUT; import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.awt.*; @Component @Path("/accounts/login") public class LoginRest{ + private Accounts accounts = Accounts.getInstance(); + + //----------------------------------------------------------- + /** + * ログイン時のトークン認証 + * @param uid ユーザーID + * @param token トークン + */ @GET + @Produces(MediaType.APPLICATION_JSON) public boolean hasLoginToken(String uid, String token) { + //if(uid != accounts.getAccountByUid(uid)) return false; + // return (token == accounts.getAccount(uid).getToken()); return false; } + // ToDo: トークン発行をJsonで返すのか, クラスで返却するのか決める. + // ToDo: クラスなら void でいい → setterを Account に用意 + + //----------------------------------------------------------- + + + }