diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/login/LoginScreenActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/login/LoginScreenActivity.java index e3afb6c..379fa57 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/login/LoginScreenActivity.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/login/LoginScreenActivity.java @@ -44,6 +44,9 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); init(); + Acanthus acanthus = (Acanthus) getApplication(); + loginScreenViewModel.LoginToken(acanthus,acanthus.getEmail(),acanthus.getPassword()); + } //----------------------------------------------------------------- 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 3457cb4..b07115b 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 @@ -54,7 +54,31 @@ @Override public void onResponse(Call call, Response response) { if (response.isSuccessful()) - setVariableFromResponse(acanthus, response.body().getToken()); + setVariableFromResponse(acanthus, response.body().getToken(),emailAddress,password); + } + + @Override + public void onFailure(Call call, Throwable t) { + } + }); + } + public void LoginToken(Acanthus acanthus, String emailForm, String passwordForm) { + Retrofit retrofit = new Retrofit.Builder() + .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/acanthus/") + .addConverterFactory(JacksonConverterFactory.create()) + .build(); + final AccountsRest accountsRest = retrofit.create(AccountsRest.class); + + String emailAddress = emailForm; + String password = passwordForm; + + // ログイン + Call call = accountsRest.issueLoginToken(emailAddress, password); + call.enqueue(new Callback() { + @Override + public void onResponse(Call call, Response response) { + if (response.isSuccessful()) + setVariableFromResponse(acanthus, response.body().getToken(),emailAddress,password); } @Override @@ -66,8 +90,10 @@ //----------------------------------------------------------------- //----------------------------------------------------------------- // ログイン成功時に値の変更を行う - private void setVariableFromResponse(Acanthus acanthus, String token) { + private void setVariableFromResponse(Acanthus acanthus, String token, String email,String password ) { acanthus.setToken(token); + acanthus.setEmail(email); + acanthus.setPassword(password); acanthusMutableLiveData.setValue(acanthus); } //-----------------------------------------------------------------