Skip to content
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.

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

fix(auth, android): linkWithCredential will not attempt to upgrade from anon user (matches iOS) #5694

Merged
merged 1 commit into from
Sep 4, 2021
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -1214,30 +1214,7 @@ private void linkWithCredential(
} else {
Exception exception = task.getException();
Log.e(TAG, "link:onComplete:failure", exception);
if (exception instanceof FirebaseAuthUserCollisionException) {
FirebaseAuthUserCollisionException authUserCollisionException =
(FirebaseAuthUserCollisionException) exception;
AuthCredential updatedCredential =
authUserCollisionException.getUpdatedCredential();
try {
firebaseAuth
.signInWithCredential(updatedCredential)
.addOnCompleteListener(
getExecutor(),
result -> {
if (result.isSuccessful()) {
promiseWithAuthResult(result.getResult(), promise);
} else {
promiseRejectAuthException(promise, exception);
}
});
} catch (Exception e) {
// we the attempt to log in after the collision failed, reject back to JS
promiseRejectAuthException(promise, exception);
}
} else {
promiseRejectAuthException(promise, exception);
}
promiseRejectAuthException(promise, exception);
}
});
} else {
Expand Down