feat: add phoneNumber to LCUser.verifyMobilePhone and resetPasswordBySmsCode (#247)

* chore: Add phoneNumber to LCUser.verifyMobilePhone and LCUser.resetPasswordBySmsCode

* fix: mobilePhoneNumber null check

---------

Co-authored-by: Wu Yun <[email protected]>

Author: juvenn

android-sdk/storage-sample-app/src/main/java/cn/leancloud/sample/testcase/UserDemoActivity.java

@@ -132,7 +132,7 @@ public void done(LCException e) {
               showSimpleInputDialog("验证短信已发送，请输入验证码", new SimpleInputDialogListner() {
                 @Override
                 public void onConfirm(String code) {
-                  LCUser.verifyMobilePhoneInBackground(code)
+                  LCUser.verifyMobilePhoneInBackground(code, text)
                       .subscribe(ObserverBuilder.buildSingleObserver(new MobilePhoneVerifyCallback() {
                         @Override
                         public void done(LCException e) {
@@ -210,7 +210,7 @@ public void done(LCException e) {
                 @Override
                 public void onConfirm(String smsCode) {
                   final String newPassword = "abcdefg";
-                  LCUser.resetPasswordBySmsCodeInBackground(smsCode, newPassword)
+                  LCUser.resetPasswordBySmsCodeInBackground(smsCode, newPassword, phone)
                       .subscribe(ObserverBuilder.buildSingleObserver(new UpdatePasswordCallback() {
                         @Override
                         public void done(LCException e) {

core/src/main/java/cn/leancloud/LCUser.java

@@ -1054,8 +1054,8 @@ public static Observable<LCNull> requestPasswordResetBySmsCodeInBackground(Strin
    * @param newPassword new password
    * @return observable instance
    */
-  public static Observable<LCNull> resetPasswordBySmsCodeInBackground(String smsCode, String newPassword) {
-    return PaasClient.getStorageClient().resetPasswordBySmsCode(smsCode, newPassword);
+  public static Observable<LCNull> resetPasswordBySmsCodeInBackground(String smsCode, String newPassword, String phoneNumber) {
+    return PaasClient.getStorageClient().resetPasswordBySmsCode(smsCode, newPassword, phoneNumber);
   }
 
   /**
@@ -1132,8 +1132,8 @@ public static Observable<LCNull> requestLoginSmsCodeInBackground(String mobilePh
    * @param verifyCode sms code
    * @return observable instance.
    */
-  public static Observable<LCNull> verifyMobilePhoneInBackground(String verifyCode) {
-    return PaasClient.getStorageClient().verifyMobilePhone(verifyCode);
+  public static Observable<LCNull> verifyMobilePhoneInBackground(String verifyCode, String phoneNumber) {
+    return PaasClient.getStorageClient().verifyMobilePhone(verifyCode, phoneNumber);
   }
 
   /**

core/src/main/java/cn/leancloud/core/StorageClient.java

@@ -593,13 +593,11 @@ public Observable<LCNull> requestMobilePhoneVerify(String mobilePhone, String va
     return wrapObservable(apiService.requestMobilePhoneVerify(map));
   }
 
-  public Observable<LCNull> verifyMobilePhone(String verifyCode) {
-    return this.verifyMobilePhone(verifyCode, null);
-  }
-
   public Observable<LCNull> verifyMobilePhone(String verifyCode, String phoneNumber) {
     Map<String, String> map = new HashMap<String, String>();
-    map.put("mobilePhoneNumber", phoneNumber);
+    if (phoneNumber != null) {
+      map.put("mobilePhoneNumber", phoneNumber);
+    }
     return wrapObservable(apiService.verifyMobilePhone(verifyCode, map));
   }
 
@@ -612,14 +610,12 @@ public Observable<LCNull> requestLoginSmsCode(String phoneNumber, String validat
     return wrapObservable(apiService.requestLoginSmsCode(map));
   }
 
-  public Observable<LCNull> resetPasswordBySmsCode(String smsCode, String newPass) {
-    return this.resetPasswordBySmsCode(smsCode, newPass, null);
-  }
-
   public Observable<LCNull> resetPasswordBySmsCode(String smsCode, String newPass, String phoneNumber) {
     Map<String, String> map = new HashMap<String, String>();
     map.put("password", newPass);
-    map.put("mobilePhoneNumber", phoneNumber);
+    if (phoneNumber != null) {
+      map.put("mobilePhoneNumber", phoneNumber);
+    }
     return wrapObservable(apiService.resetPasswordBySmsCode(smsCode, map));
   }