diff --git a/app/src/main/java/org/ntlab/acanthus_client/resources/accounts/AccountsRest.java b/app/src/main/java/org/ntlab/acanthus_client/resources/accounts/AccountsRest.java index e8a3e82..675c3b9 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/resources/accounts/AccountsRest.java +++ b/app/src/main/java/org/ntlab/acanthus_client/resources/accounts/AccountsRest.java @@ -41,22 +41,6 @@ @Path("uid")String uidStr, @Query("token")String token ); - //----------------------------------------------------------------- - //----------------------------------------------------------------- - // トークン認証 - @GET("accounts/login") - Call hasLoginToken( - @Query("uid") String uidStr, - @Query("token") String token - ); //----------------------------------------------------------------- - // トークンの発行 - @FormUrlEncoded - @PUT("accounts/login") - Call issueLoginToken( - @Field("email")String email, - @Field("password")String password - ); - //----------------------------------------------------------------- } diff --git a/app/src/main/java/org/ntlab/acanthus_client/resources/accounts/LoginRest.java b/app/src/main/java/org/ntlab/acanthus_client/resources/accounts/LoginRest.java index 630ee4b..228511b 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/resources/accounts/LoginRest.java +++ b/app/src/main/java/org/ntlab/acanthus_client/resources/accounts/LoginRest.java @@ -1,4 +1,31 @@ package org.ntlab.acanthus_client.resources.accounts; +import org.ntlab.acanthus_client.entities.AccountTokenJson; + +import retrofit2.Call; +import retrofit2.http.Field; +import retrofit2.http.FormUrlEncoded; +import retrofit2.http.GET; +import retrofit2.http.PUT; +import retrofit2.http.Query; + public interface LoginRest { + //----------------------------------------------------------------- + //----------------------------------------------------------------- + // トークン認証 + @GET("accounts/login") + Call hasLoginToken( + @Query("uid") String uidStr, + @Query("token") String token + ); + + //----------------------------------------------------------------- + // トークンの発行 + @FormUrlEncoded + @PUT("accounts/login") + Call issueLoginToken( + @Field("email")String email, + @Field("password")String password + ); + //----------------------------------------------------------------- } diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/login/LoginScreenViewModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/login/LoginScreenViewModel.java index b07115b..cffc864 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/login/LoginScreenViewModel.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/login/LoginScreenViewModel.java @@ -8,7 +8,7 @@ import org.ntlab.acanthus_client.Acanthus; import org.ntlab.acanthus_client.entities.AccountTokenJson; -import org.ntlab.acanthus_client.resources.accounts.AccountsRest; +import org.ntlab.acanthus_client.resources.accounts.LoginRest; import retrofit2.Call; import retrofit2.Callback; @@ -43,13 +43,13 @@ .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/acanthus/") .addConverterFactory(JacksonConverterFactory.create()) .build(); - final AccountsRest accountsRest = retrofit.create(AccountsRest.class); + final LoginRest loginRest = retrofit.create(LoginRest.class); String emailAddress = emailForm.getText().toString(); String password = passwordForm.getText().toString(); // ログイン - Call call = accountsRest.issueLoginToken(emailAddress, password); + Call call = loginRest.issueLoginToken(emailAddress, password); call.enqueue(new Callback() { @Override public void onResponse(Call call, Response response) { @@ -67,13 +67,13 @@ .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/acanthus/") .addConverterFactory(JacksonConverterFactory.create()) .build(); - final AccountsRest accountsRest = retrofit.create(AccountsRest.class); + final LoginRest loginRest = retrofit.create(LoginRest.class); String emailAddress = emailForm; String password = passwordForm; // ログイン - Call call = accountsRest.issueLoginToken(emailAddress, password); + Call call = loginRest.issueLoginToken(emailAddress, password); call.enqueue(new Callback() { @Override public void onResponse(Call call, Response response) { diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/title/TitleViewModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/title/TitleViewModel.java index b769bce..ebd9c5c 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/title/TitleViewModel.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/title/TitleViewModel.java @@ -8,6 +8,7 @@ import org.ntlab.acanthus_client.Acanthus; import org.ntlab.acanthus_client.entities.AccountTokenJson; import org.ntlab.acanthus_client.resources.accounts.AccountsRest; +import org.ntlab.acanthus_client.resources.accounts.LoginRest; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; @@ -41,13 +42,13 @@ .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/acanthus/") .addConverterFactory(JacksonConverterFactory.create()) .build(); - final AccountsRest accountsRest = retrofit.create(AccountsRest.class); + final LoginRest loginRest = retrofit.create(LoginRest.class); String emailAddress = emailForm; String password = passwordForm; // ログイン - Call call = accountsRest.issueLoginToken(emailAddress, password); + Call call = loginRest.issueLoginToken(emailAddress, password); call.enqueue(new Callback() { @Override public void onResponse(Call call, Response response) {