Skip to content

Add phoneNumber to LCUser.verifyMobilePhone and resetPasswordBySmsCode #247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
leeyeh merged 2 commits into from
Feb 26, 2024
Merged

Add phoneNumber to LCUser.verifyMobilePhone and resetPasswordBySmsCode #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9da10b7
chore: Add phoneNumber to LCUser.verifyMobilePhone and LCUser.resetPa…
juvenn Feb 26, 2024
cd1e1b9
fix: mobilePhoneNumber null check
juvenn Feb 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...d-sdk/storage-sample-app/src/main/java/cn/leancloud/sample/testcase/UserDemoActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down
8 changes: 4 additions & 4 deletions core/src/main/java/cn/leancloud/LCUser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/**
Expand Down Expand Up @@ -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);
}

/**
Expand Down
16 changes: 6 additions & 10 deletions core/src/main/java/cn/leancloud/core/StorageClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

Expand All @@ -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));
}

Expand Down