Fix for getAccessToken

Author: lm2343635

pluto-kotlin-client-sdk/build.gradle

@@ -4,8 +4,8 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'maven-publish'
 
 buildscript {
-    ext.versionCode = 20
-    ext.versionName = '0.8.1'
+    ext.versionCode = 21
+    ext.versionName = '0.8.2'
 }
 
 android {

pluto-kotlin-client-sdk/src/main/java/com/mushare/plutosdk/Pluto+Auth.kt

@@ -9,20 +9,25 @@ fun Pluto.getAccessToken(
     completion: (String?) -> Unit,
     handler: Pluto.PlutoRequestHandler? = null
 ) {
+    if (state != Pluto.State.signIn) {
+        completion(null)
+        return
+    }
     val accessToken = data.accessToken
-    val expire = data.expire
-    if (isForceRefresh || accessToken == null || expire == null || expire - System.currentTimeMillis() / 1000 < 5 * 60) {
-        refreshToken({
-            if (it == null) {
-                data.clear()
-            }
-            completion(it)
-        }, handler)
+    val expire = data.expire ?: 0
+    if (isForceRefresh || accessToken == null || expire - System.currentTimeMillis() / 1000 < 30) {
+        refreshAccessToken(
+            completion = {
+                completion(it)
+            },
+            handler = handler
+        )
+        return
     }
     completion(data.accessToken)
 }
 
-private fun Pluto.refreshToken(
+fun Pluto.refreshAccessToken(
     completion: (String?) -> Unit,
     handler: Pluto.PlutoRequestHandler? = null
 ) {

pluto-kotlin-client-sdk/src/main/java/com/mushare/plutosdk/PlutoResponse.kt

@@ -27,7 +27,7 @@ open class PlutoResponse(
             success()
         } else {
             when(errorCode) {
-                PlutoError.invalidRefreshToken -> {
+                PlutoError.invalidRefreshToken, PlutoError.invalidAccessToken -> {
                     Pluto.getInstance()?.let {
                         it.data.clear()
                         it.state.value = Pluto.State.invalidRefreshToken