From 862ff13294fc942b8beb45f0800b942f5bba08c1 Mon Sep 17 00:00:00 2001
From: Meng Li <lm2343635@126.com>
Date: Sun, 15 Nov 2020 15:34:20 +0900
Subject: [PATCH 1/5] Add userId for register

---
 .idea/codeStyles/Project.xml                  | 15 ++----
 pluto-kotlin-client-sdk/build.gradle          |  2 +-
 .../java/com/mushare/plutosdk/Pluto+Login.kt  | 50 ++++++++++++-------
 .../java/com/mushare/plutosdk/PlutoService.kt |  7 +--
 4 files changed, 39 insertions(+), 35 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 3cc336b..7a748e4 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -3,18 +3,9 @@
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
+          <package name="java.util" withSubpackages="false" static="false" />
+          <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
+          <package name="io.ktor" withSubpackages="true" static="false" />
         </value>
       </option>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
diff --git a/pluto-kotlin-client-sdk/build.gradle b/pluto-kotlin-client-sdk/build.gradle
index 58965a2..3138894 100644
--- 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.3.2'
+    ext.versionName = '0.4'
 }
 
 android {
diff --git a/pluto-kotlin-client-sdk/src/main/java/com/mushare/plutosdk/Pluto+Login.kt b/pluto-kotlin-client-sdk/src/main/java/com/mushare/plutosdk/Pluto+Login.kt
index 8bae673..348aeb9 100644
--- a/pluto-kotlin-client-sdk/src/main/java/com/mushare/plutosdk/Pluto+Login.kt
+++ b/pluto-kotlin-client-sdk/src/main/java/com/mushare/plutosdk/Pluto+Login.kt
@@ -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)
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
index 76c423c..22016bf 100644
--- 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
@@ -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,

From cd4e1ddccf593c9d93f3e61bf71a825e9168c256 Mon Sep 17 00:00:00 2001
From: Meng Li <lm2343635@126.com>
Date: Sun, 15 Nov 2020 15:42:54 +0900
Subject: [PATCH 2/5] Support userId for resendValidationEmail

---
 .../main/java/com/mushare/plutosdk/Pluto+Login.kt   | 13 +++++++++----
 .../main/java/com/mushare/plutosdk/PlutoService.kt  |  8 +++++++-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/pluto-kotlin-client-sdk/src/main/java/com/mushare/plutosdk/Pluto+Login.kt b/pluto-kotlin-client-sdk/src/main/java/com/mushare/plutosdk/Pluto+Login.kt
index 348aeb9..af921a1 100644
--- a/pluto-kotlin-client-sdk/src/main/java/com/mushare/plutosdk/Pluto+Login.kt
+++ b/pluto-kotlin-client-sdk/src/main/java/com/mushare/plutosdk/Pluto+Login.kt
@@ -41,12 +41,17 @@ fun Pluto.register(
 }
 
 fun Pluto.resendValidationEmail(
-    address: String,
+    account: String,
     success: () -> Unit,
     error: ((PlutoError) -> Unit)? = null,
     handler: Pluto.PlutoRequestHandler? = null
 ) {
-    plutoService.resendValidationEmail(EmailPostData(address, appId), getLanguage()).apply {
+    val postData =
+        if (account.contains("@"))
+            ResendValidationEmailPostData(null, account, appId)
+        else
+            ResendValidationEmailPostData(account, null, appId)
+    plutoService.resendValidationEmail(postData, getLanguage()).apply {
         enqueue(object : Callback<PlutoResponse> {
             override fun onFailure(call: Call<PlutoResponse>, t: Throwable) {
                 t.printStackTrace()
@@ -107,8 +112,8 @@ fun Pluto.loginWithAccount(
                 }
             })
         }.also {
-        handler?.setCall(it)
-    }
+            handler?.setCall(it)
+        }
 }
 
 fun Pluto.loginWithGoogle(
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
index 22016bf..1cf0d6a 100644
--- 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
@@ -18,7 +18,7 @@ interface PlutoService {
 
     @POST("v1/user/register/verify/mail")
     fun resendValidationEmail(
-        @Body body: EmailPostData,
+        @Body body: ResendValidationEmailPostData,
         @Header("Accept-Language") language: String
     ): Call<PlutoResponse>
 
@@ -63,6 +63,12 @@ class RegisterPostData(
     @field:SerializedName("app_id") var appId: String
 )
 
+class ResendValidationEmailPostData(
+    @field:SerializedName("user_id") var userId: String?,
+    @field:SerializedName("mail") var mail: String?,
+    @field:SerializedName("app_id") var appId: String
+)
+
 class EmailPostData(
     @field:SerializedName("mail") var mail: String,
     @field:SerializedName("app_id") var appId: String

From c6ce21472454de0236fa05003cb2020d46c75d4e Mon Sep 17 00:00:00 2001
From: Meng Li <lm2343635@126.com>
Date: Sun, 15 Nov 2020 15:50:55 +0900
Subject: [PATCH 3/5] Support to update userId

---
 .../java/com/mushare/plutosdk/Pluto+Login.kt  |  4 +-
 .../java/com/mushare/plutosdk/Pluto+User.kt   | 70 ++++++-------------
 .../java/com/mushare/plutosdk/PlutoService.kt |  3 +-
 3 files changed, 27 insertions(+), 50 deletions(-)

diff --git a/pluto-kotlin-client-sdk/src/main/java/com/mushare/plutosdk/Pluto+Login.kt b/pluto-kotlin-client-sdk/src/main/java/com/mushare/plutosdk/Pluto+Login.kt
index af921a1..1ddb240 100644
--- a/pluto-kotlin-client-sdk/src/main/java/com/mushare/plutosdk/Pluto+Login.kt
+++ b/pluto-kotlin-client-sdk/src/main/java/com/mushare/plutosdk/Pluto+Login.kt
@@ -77,7 +77,7 @@ fun Pluto.resendValidationEmail(
 }
 
 fun Pluto.loginWithAccount(
-    address: String,
+    account: String,
     password: String,
     success: (() -> Unit)? = null,
     error: ((PlutoError) -> Unit)? = null,
@@ -88,7 +88,7 @@ fun Pluto.loginWithAccount(
         error?.invoke(PlutoError.badRequest)
         return
     }
-    plutoService.loginWithAccount(LoginWithAccountPostData(address, password, deviceId, appId))
+    plutoService.loginWithAccount(LoginWithAccountPostData(account, password, deviceId, appId))
         .apply {
             enqueue(object : Callback<PlutoResponseWithBody<LoginResponse>> {
                 override fun onFailure(
diff --git a/pluto-kotlin-client-sdk/src/main/java/com/mushare/plutosdk/Pluto+User.kt b/pluto-kotlin-client-sdk/src/main/java/com/mushare/plutosdk/Pluto+User.kt
index 3918c57..fe4048c 100644
--- a/pluto-kotlin-client-sdk/src/main/java/com/mushare/plutosdk/Pluto+User.kt
+++ b/pluto-kotlin-client-sdk/src/main/java/com/mushare/plutosdk/Pluto+User.kt
@@ -61,55 +61,24 @@ fun Pluto.myInfo(
     )
 }
 
+fun Pluto.updateUserId(
+    userId: String,
+    success: () -> Unit,
+    error: ((PlutoError) -> Unit)? = null,
+    handler: Pluto.PlutoRequestHandler? = null
+) {
+    val postData = UpdateUserInfoPutData(null, null, userId)
+    updateUserInfo(postData, success, error, handler)
+}
+
 fun Pluto.updateName(
     name: String,
     success: () -> Unit,
     error: ((PlutoError) -> Unit)? = null,
     handler: Pluto.PlutoRequestHandler? = null
 ) {
-    getAuthorizationHeader(
-        completion = { header ->
-            if (header == null) {
-                handler?.setCall(null)
-                error?.invoke(PlutoError.notSignin)
-                return@getAuthorizationHeader
-            }
-
-            val body = UpdateUserInfoPutData(name, null)
-            plutoService.updateUserInfo(body, header).apply {
-                enqueue(object : Callback<PlutoResponse> {
-                    override fun onFailure(call: Call<PlutoResponse>, t: Throwable) {
-                        t.printStackTrace()
-                        error?.invoke(PlutoError.badRequest)
-                    }
-
-                    override fun onResponse(
-                        call: Call<PlutoResponse>,
-                        response: Response<PlutoResponse>
-                    ) {
-                        val plutoResponse = response.body()
-                        if (plutoResponse != null) {
-                            if (plutoResponse.statusOK()) {
-                                success()
-                            } else {
-                                error?.invoke(plutoResponse.errorCode())
-                            }
-                        } else {
-                            error?.invoke(
-                                parseErrorCodeFromErrorBody(
-                                    response.errorBody(),
-                                    gson
-                                )
-                            )
-                        }
-                    }
-                })
-            }.also {
-                handler?.setCall(it)
-            }
-        },
-        handler = handler
-    )
+    val postData = UpdateUserInfoPutData(name, null, null)
+    updateUserInfo(postData, success, error, handler)
 }
 
 fun Pluto.uploadAvatar(
@@ -122,6 +91,16 @@ fun Pluto.uploadAvatar(
     val outputStream = ByteArrayOutputStream()
     bitmap.compress(Bitmap.CompressFormat.JPEG, 100, outputStream)
     val base64 = Base64.encodeToString(outputStream.toByteArray(), Base64.DEFAULT)
+    val postData = UpdateUserInfoPutData(null, base64, null)
+    updateUserInfo(postData, success, error, handler)
+}
+
+private fun Pluto.updateUserInfo(
+    postData: UpdateUserInfoPutData,
+    success: () -> Unit,
+    error: ((PlutoError) -> Unit)? = null,
+    handler: Pluto.PlutoRequestHandler? = null
+) {
     getAuthorizationHeader(
         completion = { header ->
             if (header == null) {
@@ -130,8 +109,7 @@ fun Pluto.uploadAvatar(
                 return@getAuthorizationHeader
             }
 
-            val body = UpdateUserInfoPutData(null, base64)
-            plutoService.updateUserInfo(body, header).apply {
+            plutoService.updateUserInfo(postData, header).apply {
                 enqueue(object : Callback<PlutoResponse> {
                     override fun onFailure(call: Call<PlutoResponse>, t: Throwable) {
                         t.printStackTrace()
@@ -166,5 +144,3 @@ fun Pluto.uploadAvatar(
         handler = handler
     )
 }
-
-
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
index 1cf0d6a..c6b08ac 100644
--- 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
@@ -89,5 +89,6 @@ class LoginWithGooglePostData(
 
 class UpdateUserInfoPutData(
     @field:SerializedName("name") var name: String?,
-    @field:SerializedName("avatar") var avatar: String?
+    @field:SerializedName("avatar") var avatar: String?,
+    @field:SerializedName("avatar") var userId: String?
 )
\ No newline at end of file

From bfcd59923329740d46059f34d9891e706f8577f5 Mon Sep 17 00:00:00 2001
From: Meng Li <lm2343635@126.com>
Date: Sun, 15 Nov 2020 15:57:46 +0900
Subject: [PATCH 4/5] Update error code

---
 .../main/java/com/mushare/plutosdk/Pluto+User.kt  |  4 ++--
 .../java/com/mushare/plutosdk/PlutoResponse.kt    | 15 +++++++++++----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/pluto-kotlin-client-sdk/src/main/java/com/mushare/plutosdk/Pluto+User.kt b/pluto-kotlin-client-sdk/src/main/java/com/mushare/plutosdk/Pluto+User.kt
index fe4048c..9fc558d 100644
--- a/pluto-kotlin-client-sdk/src/main/java/com/mushare/plutosdk/Pluto+User.kt
+++ b/pluto-kotlin-client-sdk/src/main/java/com/mushare/plutosdk/Pluto+User.kt
@@ -18,7 +18,7 @@ fun Pluto.myInfo(
         completion = { header ->
             if (header == null) {
                 handler?.setCall(null)
-                error?.invoke(PlutoError.notSignin)
+                error?.invoke(PlutoError.notSignIn)
                 return@getAuthorizationHeader
             }
 
@@ -105,7 +105,7 @@ private fun Pluto.updateUserInfo(
         completion = { header ->
             if (header == null) {
                 handler?.setCall(null)
-                error?.invoke(PlutoError.notSignin)
+                error?.invoke(PlutoError.notSignIn)
                 return@getAuthorizationHeader
             }
 
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
index 13391df..eb38348 100644
--- 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
@@ -47,15 +47,22 @@ enum class PlutoError(val value: Int) {
     unknown(-99999),
     badRequest(-99998),
     parseError(-99997),
-    notSignin(1001),
+    notSignIn(1001),
     mailAlreadyRegister(2001),
     mailNotExist(2002),
     mailNotVerified(2003),
     mailAlreadyVerified(2004),
-    userNameNotExist(2005),
-    userNameExist(2006),
+    userIdNotExist(2005),
+    userIdExist(2006),
+    passwordNotSet(2009),
     sendMailFailure(2011),
     invalidPassword(3001),
     invalidRefreshToken(3002),
-    invalidJWTToken(3003);
+    invalidJWTToken(3003),
+    invalidGoogleIDToken(3004),
+    invalidAvatarFormat(3006),
+    jwtTokenExpired(3008),
+    invalidAccessToken(3009),
+    invalidApplication(3010),
+    refreshTokenExpired(3011);
 }
\ No newline at end of file

From 766e5f58ea15ea92b10458707cd0168ea5a024ef Mon Sep 17 00:00:00 2001
From: Meng Li <lm2343635@126.com>
Date: Sun, 15 Nov 2020 16:03:32 +0900
Subject: [PATCH 5/5] User EMAIL_ADDRESS patterns

---
 .../src/main/java/com/mushare/plutosdk/Pluto+Login.kt          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pluto-kotlin-client-sdk/src/main/java/com/mushare/plutosdk/Pluto+Login.kt b/pluto-kotlin-client-sdk/src/main/java/com/mushare/plutosdk/Pluto+Login.kt
index 1ddb240..a8bf0b6 100644
--- a/pluto-kotlin-client-sdk/src/main/java/com/mushare/plutosdk/Pluto+Login.kt
+++ b/pluto-kotlin-client-sdk/src/main/java/com/mushare/plutosdk/Pluto+Login.kt
@@ -1,5 +1,6 @@
 package com.mushare.plutosdk
 
+import android.util.Patterns
 import com.mushare.plutosdk.Pluto.Companion.appId
 import retrofit2.Call
 import retrofit2.Callback
@@ -47,7 +48,7 @@ fun Pluto.resendValidationEmail(
     handler: Pluto.PlutoRequestHandler? = null
 ) {
     val postData =
-        if (account.contains("@"))
+        if (Patterns.EMAIL_ADDRESS.matcher(account).matches())
             ResendValidationEmailPostData(null, account, appId)
         else
             ResendValidationEmailPostData(account, null, appId)