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

Adapt for pluto master

Author: lm2343635

.gitignore

@@ -82,4 +82,7 @@ lint/intermediates/
 lint/generated/
 lint/outputs/
 lint/tmp/
-# lint/reports/
+# lint/reports/
+
+# idea
+.idea/

build.gradle

@@ -20,7 +20,6 @@ allprojects {
     repositories {
         google()
         jcenter()
-        
     }
 }
 

demoapp/src/main/java/com/mushare/demoapp/data/LoginDataSource.kt

@@ -16,7 +16,7 @@ class LoginDataSource {
             // TODO: handle loggedInUser authentication
             //pluto?.registerByEmail(username, password, "Test", {
             //pluto?.resendValidationEmail(username, {
-            pluto?.loginWithEmail(username, password, {
+            pluto?.loginWithAccount(username, password, {
                 pluto.myInfo({
                     val fakeUser = LoggedInUser(java.util.UUID.randomUUID().toString(), it.name)
                     onComplete(Result.Success(fakeUser))

demoapp/src/main/java/com/mushare/demoapp/ui/login/LoginActivity.kt

@@ -27,7 +27,11 @@ class LoginActivity : AppCompatActivity() {
 
         setContentView(R.layout.activity_login)
 
-        Pluto.initialize(this,"https://staging.easyjapanese-api-gateway.mushare.cn/pluto/","org.mushare.easyjapanese")
+        Pluto.initialize(
+            this,
+            "https://staging.easyjapanese-api-gateway.mushare.cn/pluto-master/",
+            "org.mushare.easyjapanese"
+        )
 
         val username = findViewById<EditText>(R.id.username)
         val password = findViewById<EditText>(R.id.password)

demoapp/src/main/java/com/mushare/demoapp/ui/login/LoginViewModel.kt

@@ -51,6 +51,6 @@ class LoginViewModel(private val loginRepository: LoginRepository) : ViewModel()
 
     // A placeholder password validation check
     private fun isPasswordValid(password: String): Boolean {
-        return password.length > 5
+        return password.length > 2
     }
 }

pluto-kotlin-client-sdk/build.gradle

@@ -4,8 +4,8 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'maven-publish'
 
 buildscript {
-    ext.versionCode = 10
-    ext.versionName = '0.1.9'
+    ext.versionCode = 11
+    ext.versionName = '0.2'
 }
 
 android {

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

@@ -1,6 +1,5 @@
 package com.mushare.plutosdk
 
-import com.mushare.plutosdk.Pluto.Companion.appId
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -22,12 +21,11 @@ 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
-    val deviceId = data.deviceID
-    if (userId == null || refreshToken == null || deviceId == null) {
+    if (userId == null || refreshToken == null) {
         completion(null)
         return
     }
-    plutoService.refreshAuth(RefreshAuthPostData(refreshToken, userId, deviceId, appId)).apply {
+    plutoService.refreshAuth(RefreshAuthPostData(refreshToken, userId)).apply {
         enqueue(object : Callback<PlutoResponseWithBody<RefreshAuthResponse>> {
             override fun onFailure(
                 call: Call<PlutoResponseWithBody<RefreshAuthResponse>>,

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

@@ -57,13 +57,13 @@ fun Pluto.resendValidationEmail(address: String, success: () -> Unit, error: ((P
     }
 }
 
-fun Pluto.loginWithEmail(address: String, password: String, success: (() -> Unit)? = null, error: ((PlutoError) -> Unit)? = null, handler: Pluto.PlutoRequestHandler? = null) {
+fun Pluto.loginWithAccount(address: String, password: String, success: (() -> Unit)? = null, error: ((PlutoError) -> Unit)? = null, handler: Pluto.PlutoRequestHandler? = null) {
     val deviceId = data.deviceID
     if (deviceId == null) {
         error?.invoke(PlutoError.badRequest)
         return
     }
-    plutoService.loginWithEmail(LoginWithEmailPostData(address, password, deviceId, appId)).apply {
+    plutoService.loginWithAccount(LoginWithAccountPostData(address, password, deviceId, appId)).apply {
         enqueue(object : Callback<PlutoResponseWithBody<LoginResponse>> {
             override fun onFailure(call: Call<PlutoResponseWithBody<LoginResponse>>, t: Throwable) {
                 t.printStackTrace()
@@ -145,10 +145,8 @@ fun Pluto.logout() {
 private fun Pluto.handleLogin(response: PlutoResponseWithBody<LoginResponse>, success: (() -> Unit)?, error: ((PlutoError) -> Unit)?) {
     if (response.statusOK()) {
         val body = response.getBody()
-        val refreshToken = body.refreshToken
-        val jwt = body.jwt
-        data.updateRefreshToken(refreshToken)
-        if (!data.updateJwt(jwt)) {
+        data.updateRefreshToken(body.refreshToken)
+        if (!data.updateJwt(body.accessToken)) {
             error?.invoke(PlutoError.parseError)
             return
         }

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

@@ -68,8 +68,8 @@ internal class PlutoModel(context: Context) {
         val body = JwtUtils.decodeBody(jwt) ?: return false
         return try {
             val json = JSONObject(body)
-            _userId.value = json.getInt("userId")
-            _expire.value = json.getInt("expire_time")
+            _userId.value = json.getInt("sub")
+            _expire.value = json.getInt("exp")
             _jwt.value = jwt
             true
         } catch (e: Exception) {

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

@@ -31,7 +31,7 @@ class RefreshAuthResponse(
 
 class LoginResponse(
     @field:SerializedName("refresh_token") var refreshToken: String,
-    @field:SerializedName("jwt") var jwt: String
+    @field:SerializedName("access_token") var accessToken: String
 )
 
 internal fun parseErrorCodeFromErrorBody(errorBody: ResponseBody?, gson: Gson): PlutoError {