Add userId for register

Author: lm2343635

.idea/codeStyles/Project.xml

@@ -5,7 +5,7 @@ apply plugin: 'maven-publish'
 
 buildscript {
     ext.versionCode = 11
-    ext.versionName = '0.3.2'
+    ext.versionName = '0.4'
 }
 
 android {

pluto-kotlin-client-sdk/build.gradle

@@ -5,15 +5,17 @@ import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
 
-fun Pluto.registerByEmail(
-    address: String,
+fun Pluto.register(
+    userId: String,
+    mail: String,
     password: String,
     name: String,
     success: () -> Unit,
     error: ((PlutoError) -> Unit)? = null,
     handler: Pluto.PlutoRequestHandler? = null
 ) {
-    plutoService.registerWithEmail(RegisterWithEmailPostData(address, password, name, appId), getLanguage()).apply {
+    val postData = RegisterPostData(userId, mail, password, name, appId)
+    plutoService.register(postData, getLanguage()).apply {
         enqueue(object : Callback<PlutoResponse> {
             override fun onFailure(call: Call<PlutoResponse>, t: Throwable) {
                 t.printStackTrace()
@@ -81,23 +83,30 @@ fun Pluto.loginWithAccount(
         error?.invoke(PlutoError.badRequest)
         return
     }
-    plutoService.loginWithAccount(LoginWithAccountPostData(address, password, deviceId, appId)).apply {
-        enqueue(object : Callback<PlutoResponseWithBody<LoginResponse>> {
-            override fun onFailure(call: Call<PlutoResponseWithBody<LoginResponse>>, t: Throwable) {
-                t.printStackTrace()
-                error?.invoke(PlutoError.badRequest)
-            }
+    plutoService.loginWithAccount(LoginWithAccountPostData(address, password, deviceId, appId))
+        .apply {
+            enqueue(object : Callback<PlutoResponseWithBody<LoginResponse>> {
+                override fun onFailure(
+                    call: Call<PlutoResponseWithBody<LoginResponse>>,
+                    t: Throwable
+                ) {
+                    t.printStackTrace()
+                    error?.invoke(PlutoError.badRequest)
+                }
 
-            override fun onResponse(call: Call<PlutoResponseWithBody<LoginResponse>>, response: Response<PlutoResponseWithBody<LoginResponse>>) {
-                val plutoResponse = response.body()
-                if (plutoResponse != null) {
-                    handleLogin(plutoResponse, success, error)
-                } else {
-                    error?.invoke(parseErrorCodeFromErrorBody(response.errorBody(), gson))
+                override fun onResponse(
+                    call: Call<PlutoResponseWithBody<LoginResponse>>,
+                    response: Response<PlutoResponseWithBody<LoginResponse>>
+                ) {
+                    val plutoResponse = response.body()
+                    if (plutoResponse != null) {
+                        handleLogin(plutoResponse, success, error)
+                    } else {
+                        error?.invoke(parseErrorCodeFromErrorBody(response.errorBody(), gson))
+                    }
                 }
-            }
-        })
-    }.also {
+            })
+        }.also {
         handler?.setCall(it)
     }
 }
@@ -120,7 +129,10 @@ fun Pluto.loginWithGoogle(
                 error?.invoke(PlutoError.badRequest)
             }
 
-            override fun onResponse(call: Call<PlutoResponseWithBody<LoginResponse>>, response: Response<PlutoResponseWithBody<LoginResponse>>) {
+            override fun onResponse(
+                call: Call<PlutoResponseWithBody<LoginResponse>>,
+                response: Response<PlutoResponseWithBody<LoginResponse>>
+            ) {
                 val plutoResponse = response.body()
                 if (plutoResponse != null) {
                     handleLogin(plutoResponse, success, error)

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

@@ -11,8 +11,8 @@ interface PlutoService {
     ): Call<PlutoResponseWithBody<RefreshAuthResponse>>
 
     @POST("v1/user/register")
-    fun registerWithEmail(
-        @Body body: RegisterWithEmailPostData,
+    fun register(
+        @Body body: RegisterPostData,
         @Header("Accept-Language") language: String
     ): Call<PlutoResponse>
 
@@ -55,7 +55,8 @@ class RefreshAuthPostData(
     @field:SerializedName("app_id") var appId: String
 )
 
-class RegisterWithEmailPostData(
+class RegisterPostData(
+    @field:SerializedName("user_id") var userId: String,
     @field:SerializedName("mail") var mail: String,
     @field:SerializedName("password") var password: String,
     @field:SerializedName("name") var name: String,