refact with retrofit2

Author: dklaputa

.idea/misc.xml

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.70'
+    ext.kotlin_version = '1.3.72'
     repositories {
         google()
         jcenter()

build.gradle

@@ -6,6 +6,11 @@ android {
     compileSdkVersion 29
     buildToolsVersion "29.0.3"
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
     defaultConfig {
         applicationId "com.mushare.demoapp"
         minSdkVersion 16
@@ -34,7 +39,7 @@ dependencies {
     implementation 'androidx.annotation:annotation:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
     implementation project(path: ':pluto-kotlin-client-sdk')

demoapp/build.gradle

@@ -17,12 +17,12 @@ class LoginDataSource {
             //pluto?.registerByEmail(username, password, "Test", {
             //pluto?.resendValidationEmail(username, {
             pluto?.loginWithEmail(username, password, {
-                pluto?.myInfo({
+                pluto.myInfo({
                     val fakeUser = LoggedInUser(java.util.UUID.randomUUID().toString(), it.name)
                     onComplete(Result.Success(fakeUser))
                 }, {
-                    onComplete(Result.Error(IOException("Error logging in $it")))
-                    Log.e("login", "failed $it")
+                    onComplete(Result.Error(IOException("Error getting account info $it")))
+                    Log.e("getInfo", "failed $it")
                 })
             }, {
                 onComplete(Result.Error(IOException("Error logging in $it")))

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

@@ -27,7 +27,7 @@ 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/","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/LoginActivity.kt

@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 29
-        versionCode 6
-        versionName "0.1.5"
+        versionCode 7
+        versionName "0.1.6"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
@@ -36,7 +36,7 @@ publishing {
         gpr(MavenPublication) {
             groupId "org.mushare"
             artifactId "pluto-kotlin-client-sdk"
-            version "0.1.5"
+            version "0.1.6"
             artifact sourceJar
             artifact "$buildDir/outputs/aar/pluto-kotlin-client-sdk-release.aar"
 
@@ -74,6 +74,8 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.core:core-ktx:1.2.0'
+    implementation 'com.squareup.retrofit2:retrofit:2.7.2'
+    implementation 'com.squareup.retrofit2:converter-gson:2.7.2'
     implementation 'com.squareup.okhttp3:okhttp:4.4.0'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     testImplementation 'junit:junit:4.13'

pluto-kotlin-client-sdk/build.gradle

@@ -1,12 +1,7 @@
 package com.mushare.plutosdk
 
 import com.mushare.plutosdk.Pluto.Companion.appId
-import okhttp3.Call
-import okhttp3.Callback
-import okhttp3.Headers
-import okhttp3.Response
-import org.json.JSONObject
-import java.io.IOException
+import retrofit2.Callback
 
 fun Pluto.getToken(completion: (String?) -> Unit) {
     val jwt = data.jwt
@@ -26,33 +21,32 @@ fun Pluto.getToken(completion: (String?) -> Unit) {
 private fun Pluto.refreshToken(completion: (String?) -> Unit) {
     val userId = data.userId
     val refreshToken = data.refreshToken
-    if (userId == null || refreshToken == null) {
+    val deviceId = data.deviceID
+    if (userId == null || refreshToken == null || deviceId == null) {
         completion(null)
         return
     }
-    val bodyJson = JSONObject()
-    bodyJson.put("refresh_token", refreshToken)
-    bodyJson.put("user_id", userId)
-    bodyJson.put("device_id", data.deviceID)
-    bodyJson.put("app_id", appId)
-    requestPost("api/auth/refresh", bodyJson, commonHeaders, object : Callback {
-        override fun onFailure(call: Call, e: IOException) {
-            e.printStackTrace()
+    plutoService.refreshAuth(
+        RefreshAuthPostData(refreshToken, userId, deviceId, appId)
+    ).enqueue(object : Callback<PlutoResponseWithBody<RefreshAuthResponse>> {
+        override fun onFailure(
+            call: retrofit2.Call<PlutoResponseWithBody<RefreshAuthResponse>>,
+            t: Throwable
+        ) {
+            t.printStackTrace()
             completion(null)
         }
 
-        override fun onResponse(call: Call, response: Response) {
-            val plutoResponse = PlutoResponse(response)
-            if (plutoResponse.statusOK()) {
-                try {
-                    val jwt = plutoResponse.getBody().getString("jwt")
-                    if (data.updateJwt(jwt)) {
-                        completion(jwt)
-                    } else {
-                        completion(null)
-                    }
-                } catch (e: Exception) {
-                    e.printStackTrace()
+        override fun onResponse(
+            call: retrofit2.Call<PlutoResponseWithBody<RefreshAuthResponse>>,
+            response: retrofit2.Response<PlutoResponseWithBody<RefreshAuthResponse>>
+        ) {
+            val plutoResponse = response.body()
+            if (plutoResponse != null && plutoResponse.statusOK()) {
+                val jwt = plutoResponse.getBody().jwt
+                if (data.updateJwt(jwt)) {
+                    completion(jwt)
+                } else {
                     completion(null)
                 }
             } else {
@@ -62,12 +56,12 @@ private fun Pluto.refreshToken(completion: (String?) -> Unit) {
     })
 }
 
-fun Pluto.getHeaders(completion: (Headers) -> Unit) {
+fun Pluto.getAuthorizationHeader(completion: (Map<String, String>?) -> Unit) {
     getToken {
         if (it == null) {
-            completion(commonHeaders)
+            completion(null)
         } else {
-            completion(commonHeaders.newBuilder().add("Authorization", "jwt $it").build())
+            completion(hashMapOf("Authorization" to "jwt $it"))
         }
     }
 }