Merge pull request #3 from MuShare/develop/pluto-master

lm2343635 · web-flow · commit 4e4dc95592c2 · 2020-08-25T23:26:59.000+09:00
Fix refreshing token
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/demoapp/src/main/AndroidManifest.xml b/demoapp/src/main/AndroidManifest.xml
@@ -20,6 +20,11 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name=".ui.login.ProfileActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".ui.login.LoginActivity" />
+        </activity>
     </application>
 
 </manifest>
diff --git a/demoapp/src/main/java/com/mushare/demoapp/ui/login/LoginActivity.kt b/demoapp/src/main/java/com/mushare/demoapp/ui/login/LoginActivity.kt
@@ -1,6 +1,7 @@
 package com.mushare.demoapp.ui.login
 
 import android.app.Activity
+import android.content.Intent
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProviders
 import android.os.Bundle
@@ -102,6 +103,10 @@ class LoginActivity : AppCompatActivity() {
                 loginViewModel.login(username.text.toString(), password.text.toString())
             }
         }
+
+        if (Pluto.getInstance()?.state == Pluto.State.signin) {
+            startActivity(Intent(this, ProfileActivity::class.java))
+        }
     }
 
     private fun updateUiWithUser(model: LoggedInUserView) {
@@ -113,6 +118,10 @@ class LoginActivity : AppCompatActivity() {
             "$welcome $displayName",
             Toast.LENGTH_LONG
         ).show()
+
+        val intent = Intent(this, ProfileActivity::class.java)
+        intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+        startActivity(intent)
     }
 
     private fun showLoginFailed(@StringRes errorString: Int) {
diff --git a/demoapp/src/main/java/com/mushare/demoapp/ui/login/ProfileActivity.kt b/demoapp/src/main/java/com/mushare/demoapp/ui/login/ProfileActivity.kt
@@ -0,0 +1,34 @@
+package com.mushare.demoapp.ui.login;
+
+import android.os.Bundle
+import android.widget.Button
+import android.widget.TextView
+import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
+import com.mushare.demoapp.R
+import com.mushare.plutosdk.Pluto
+import com.mushare.plutosdk.getToken
+import com.mushare.plutosdk.myInfo
+
+class ProfileActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setContentView(R.layout.activity_profile)
+
+        Pluto.getInstance()?.myInfo(success = {
+            findViewById<TextView>(R.id.profile_name).text = it.name
+        })
+
+        Pluto.getInstance()?.getToken(completion = {
+            findViewById<TextView>(R.id.profile_access_token).text = it ?: "Refresh failed"
+        })
+
+        findViewById<Button>(R.id.profile_refresh_token).setOnClickListener {
+            Pluto.getInstance()?.getToken(isForceRefresh = true, completion = {
+                findViewById<TextView>(R.id.profile_access_token).text = it ?: "Refresh failed"
+            })
+        }
+    }
+}
diff --git a/demoapp/src/main/res/layout/activity_profile.xml b/demoapp/src/main/res/layout/activity_profile.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <TextView
+        android:id="@+id/profile_name"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="20dp"
+        android:layout_marginEnd="20dp"
+        android:text="Username"/>
+
+    <Button
+        android:id="@+id/profile_refresh_token"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/profile_name"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="20dp"
+        android:layout_marginEnd="20dp"
+        android:text="Refresh Token"/>
+
+    <TextView
+        android:id="@+id/profile_access_token"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/profile_refresh_token"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="20dp"
+        android:layout_marginEnd="20dp"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/pluto-kotlin-client-sdk/build.gradle b/pluto-kotlin-client-sdk/build.gradle
@@ -5,7 +5,7 @@ apply plugin: 'maven-publish'
 
 buildscript {
     ext.versionCode = 11
-    ext.versionName = '0.2'
+    ext.versionName = '0.2.1'
 }
 
 android {
diff --git a/pluto-kotlin-client-sdk/src/main/java/com/mushare/plutosdk/Pluto+Auth.kt b/pluto-kotlin-client-sdk/src/main/java/com/mushare/plutosdk/Pluto+Auth.kt
@@ -4,10 +4,10 @@ import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
 
-fun Pluto.getToken(completion: (String?) -> Unit, handler: Pluto.PlutoRequestHandler? = null) {
+fun Pluto.getToken(isForceRefresh: Boolean = false, completion: (String?) -> Unit, handler: Pluto.PlutoRequestHandler? = null) {
     val jwt = data.jwt
     val expire = data.expire
-    if (jwt == null || expire == null || expire - System.currentTimeMillis() / 1000 < 5 * 60) {
+    if (isForceRefresh || jwt == null || expire == null || expire - System.currentTimeMillis() / 1000 < 5 * 60) {
         refreshToken({
             if (it == null) {
                 data.clear()
@@ -19,13 +19,12 @@ fun Pluto.getToken(completion: (String?) -> Unit, handler: Pluto.PlutoRequestHan
 }
 
 private fun Pluto.refreshToken(completion: (String?) -> Unit, handler: Pluto.PlutoRequestHandler? = null) {
-    val userId = data.userId
     val refreshToken = data.refreshToken
-    if (userId == null || refreshToken == null) {
+    if (refreshToken == null) {
         completion(null)
         return
     }
-    plutoService.refreshAuth(RefreshAuthPostData(refreshToken, userId)).apply {
+    plutoService.refreshAuth(RefreshAuthPostData(refreshToken, Pluto.appId)).apply {
         enqueue(object : Callback<PlutoResponseWithBody<RefreshAuthResponse>> {
             override fun onFailure(
                 call: Call<PlutoResponseWithBody<RefreshAuthResponse>>,
@@ -38,9 +37,11 @@ private fun Pluto.refreshToken(completion: (String?) -> Unit, handler: Pluto.Plu
             override fun onResponse(call: Call<PlutoResponseWithBody<RefreshAuthResponse>>, response: Response<PlutoResponseWithBody<RefreshAuthResponse>>) {
                 val plutoResponse = response.body()
                 if (plutoResponse != null && plutoResponse.statusOK()) {
-                    val jwt = plutoResponse.getBody().jwt
-                    if (data.updateJwt(jwt)) {
-                        completion(jwt)
+                    val accessToken = plutoResponse.getBody().accessToken
+                    val refreshToken = plutoResponse.getBody().refreshToken
+                    if (data.updateJwt(accessToken)) {
+                        data.updateRefreshToken(refreshToken)
+                        completion(accessToken)
                     } else {
                         completion(null)
                     }
@@ -55,11 +56,14 @@ private fun Pluto.refreshToken(completion: (String?) -> Unit, handler: Pluto.Plu
 }
 
 fun Pluto.getAuthorizationHeader(completion: (Map<String, String>?) -> Unit, handler: Pluto.PlutoRequestHandler? = null) {
-    getToken({ token ->
-        if (token == null) {
-            completion(null)
-        } else {
-            completion(hashMapOf("Authorization" to "jwt $token"))
-        }
-    }, handler)
+    getToken(
+        completion = { token ->
+            if (token == null) {
+                completion(null)
+            } else {
+                completion(hashMapOf("Authorization" to "jwt $token"))
+            }
+        },
+        handler = handler
+    )
 }
diff --git a/pluto-kotlin-client-sdk/src/main/java/com/mushare/plutosdk/Pluto.kt b/pluto-kotlin-client-sdk/src/main/java/com/mushare/plutosdk/Pluto.kt
@@ -60,7 +60,7 @@ class Pluto private constructor() {
     }
 
     init {
-        getToken({
+        getToken(completion = {
             state.postValue(
                 if (it == null) {
                     State.notSignin
diff --git a/pluto-kotlin-client-sdk/src/main/java/com/mushare/plutosdk/PlutoModel.kt b/pluto-kotlin-client-sdk/src/main/java/com/mushare/plutosdk/PlutoModel.kt
@@ -44,18 +44,16 @@ internal class PlutoModel(context: Context) {
     private var _userId = IntWrapper(USER_ID_SAVE_KEY, sharedPref)
     val userId get() = _userId.value
 
-    private var _mail = StringWrapper(MAIL_SAVE_KEY, sharedPref)
     private var _name = StringWrapper(NAME_SAVE_KEY, sharedPref)
     private var _avatar = StringWrapper(AVATAR_SAVE_KEY, sharedPref)
 
     var user: PlutoUser?
         get() {
-            return if (_userId.value == null || _mail.value == null || _name.value == null || _avatar.value == null) null
-            else PlutoUser(_userId.value!!, _mail.value!!, _avatar.value!!, _name.value!!)
+            return if (_userId.value == null || _name.value == null || _avatar.value == null) null
+            else PlutoUser(_userId.value!!, _avatar.value!!, _name.value!!)
         }
         set(value) {
             _userId.value = value?.id
-            _mail.value = value?.mail
             _name.value = value?.name
             _avatar.value = value?.avatar
         }
@@ -87,8 +85,7 @@ internal class PlutoModel(context: Context) {
 }
 
 data class PlutoUser(
-    @field:SerializedName("id") var id: Int,
-    @field:SerializedName("mail") var mail: String,
+    @field:SerializedName("sub") var id: Int,
     @field:SerializedName("avatar") var avatar: String,
     @field:SerializedName("name") var name: String
 )
diff --git a/pluto-kotlin-client-sdk/src/main/java/com/mushare/plutosdk/PlutoResponse.kt b/pluto-kotlin-client-sdk/src/main/java/com/mushare/plutosdk/PlutoResponse.kt
@@ -26,7 +26,8 @@ class PlutoResponseErrorData(
 )
 
 class RefreshAuthResponse(
-    @field:SerializedName("jwt") var jwt: String
+    @field:SerializedName("access_token") var accessToken: String,
+    @field:SerializedName("refresh_token") var refreshToken: String
 )
 
 class LoginResponse(
diff --git a/pluto-kotlin-client-sdk/src/main/java/com/mushare/plutosdk/PlutoService.kt b/pluto-kotlin-client-sdk/src/main/java/com/mushare/plutosdk/PlutoService.kt
@@ -46,7 +46,7 @@ interface PlutoService {
 
 class RefreshAuthPostData(
     @field:SerializedName("refresh_token") var refreshToken: String,
-    @field:SerializedName("user_id") var userId: Int
+    @field:SerializedName("app_id") var appId: String
 )
 
 class RegisterWithEmailPostData(

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ apply plugin: 'maven-publish'`
`5`	`5`
`6`	`6`	`buildscript {`
`7`	`7`	`ext.versionCode = 11`
`8`		`- ext.versionName = '0.2'`
	`8`	`+ ext.versionName = '0.2.1'`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`android {`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ class Pluto private constructor() {`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`init {`
`63`		`- getToken({`
	`63`	`+ getToken(completion = {`
`64`	`64`	`state.postValue(`
`65`	`65`	`if (it == null) {`
`66`	`66`	`State.notSignin`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,8 @@ class PlutoResponseErrorData(`
`26`	`26`	`)`
`27`	`27`
`28`	`28`	`class RefreshAuthResponse(`
`29`		`- @field:SerializedName("jwt") var jwt: String`
	`29`	`+ @field:SerializedName("access_token") var accessToken: String,`
	`30`	`+ @field:SerializedName("refresh_token") var refreshToken: String`
`30`	`31`	`)`
`31`	`32`
`32`	`33`	`class LoginResponse(`