[WIP]

TODO * ユーザー情報を取得してDBに保存する処理を実装する * Statusクラスは改良の余地があるかも？
jageishi · Apr 14, 2020 · 61270db · 61270db
1 parent 53618d0
commit 61270db
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 2 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -72,6 +72,11 @@ dependencies {
     implementation "com.github.scribejava:scribejava:$scribe_java_version"
     implementation "com.github.scribejava:scribejava-core:$scribe_java_version"
 
+
+    def room_version = "2.2.2"
+    implementation "androidx.room:room-runtime:$room_version"
+    annotationProcessor "androidx.room:room-compiler:$room_version"
+
     implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.1.0'
     testImplementation 'junit:junit:4.12'

diff --git a/app/src/main/java/org/ageage/eggplant/common/api/UserService.kt b/app/src/main/java/org/ageage/eggplant/common/api/UserService.kt
@@ -0,0 +1,10 @@
+package org.ageage.eggplant.common.api
+
+import io.reactivex.Single
+import org.ageage.eggplant.common.api.response.User
+import retrofit2.http.GET
+
+interface UserService {
+    @GET("/rest/1/my")
+    fun userData(): Single<User>
+}
diff --git a/app/src/main/java/org/ageage/eggplant/common/api/response/User.kt b/app/src/main/java/org/ageage/eggplant/common/api/response/User.kt
@@ -0,0 +1,5 @@
+package org.ageage.eggplant.common.api.response
+
+data class User(
+    val name: String
+)
diff --git a/app/src/main/java/org/ageage/eggplant/common/db/entity/User.kt b/app/src/main/java/org/ageage/eggplant/common/db/entity/User.kt
@@ -0,0 +1,13 @@
+package org.ageage.eggplant.common.db.entity
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity
+data class User(
+    @PrimaryKey(autoGenerate = true) val id: Int,
+    @ColumnInfo(name = "name") val name: String,
+    @ColumnInfo(name = "oauth_token") val oAuthToken: String,
+    @ColumnInfo(name = "oauth_token_secret") val oAuthTokenSecret: String
+)
diff --git a/app/src/main/java/org/ageage/eggplant/common/oauth/HatenaOAuthManager.kt b/app/src/main/java/org/ageage/eggplant/common/oauth/HatenaOAuthManager.kt
@@ -1,6 +1,7 @@
 package org.ageage.eggplant.common.oauth
 
 import com.github.scribejava.core.builder.ServiceBuilder
+import com.github.scribejava.core.model.OAuth1AccessToken
 import com.github.scribejava.core.model.OAuth1RequestToken
 import com.github.scribejava.core.oauth.OAuth10aService
 import io.reactivex.Single
@@ -29,11 +30,11 @@ class HatenaOAuthManager(
         }
     }
 
-    fun fetchAccessToken(oauthVerifier: String): Single<String> {
+    fun fetchAccessToken(oauthVerifier: String): Single<OAuth1AccessToken> {
         return Single.create {
             service?.let { oAuthService ->
                 val accessToken = oAuthService.getAccessToken(requestToken, oauthVerifier)
-                it.onSuccess(accessToken.rawResponse)
+                it.onSuccess(accessToken)
             }
         }
     }

diff --git a/app/src/main/java/org/ageage/eggplant/common/repository/LoginRepository.kt b/app/src/main/java/org/ageage/eggplant/common/repository/LoginRepository.kt
@@ -11,4 +11,8 @@ class LoginRepository {
     fun fetchAuthorizationUrl() = oAuthManager.fetchAuthorizationUrl()
 
     fun fetchAccessToken(oAuthVerifier: String) = oAuthManager.fetchAccessToken(oAuthVerifier)
+
+    fun fetchUserData() {
+
+    }
 }
diff --git a/app/src/main/java/org/ageage/eggplant/login/LoginFragment.kt b/app/src/main/java/org/ageage/eggplant/login/LoginFragment.kt
@@ -41,6 +41,11 @@ class LoginFragment : Fragment() {
                     startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(it.data)))
                 }
                 is LoginViewModel.Status.Error -> {
+                    Toast.makeText(
+                        requireContext(),
+                        getString(R.string.failed_to_link_with_hatena),
+                        Toast.LENGTH_SHORT
+                    ).show()
                 }
             }
         })
@@ -53,6 +58,11 @@ class LoginFragment : Fragment() {
                     Toast.makeText(requireContext(), "成功", Toast.LENGTH_SHORT).show()
                 }
                 is LoginViewModel.Status.Error -> {
+                    Toast.makeText(
+                        requireContext(),
+                        getString(R.string.failed_to_login),
+                        Toast.LENGTH_SHORT
+                    ).show()
                 }
             }
         })

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -51,4 +51,6 @@
     <string name="button_text_for_access_to_hatena">はてなとの連携を許可する</string>
     <string name="hint_for_login_to_hatena">コードを貼り付けてください</string>
     <string name="button_text_for_login_to_hatena">はてなにログインする</string>
+    <string name="failed_to_link_with_hatena">はてなとの連携に失敗しました。</string>
+    <string name="failed_to_login">ログインに失敗しました。</string>
 </resources>