status-im
/
react-native-firebase
mirror of
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[auth][android] Make sure email field is populated for password providers

This commit is contained in:
Chris Bianca 2017-10-26 17:06:34 +01:00
parent 447f74c1d1
commit 44278f59cc
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
android/src/main/java/io/invertase/firebase/auth/RNFirebaseAuth.java
View File

@ -33,6 +33,7 @@ import com.google.firebase.auth.ActionCodeResult;
import com.google.firebase.auth.AuthCredential;
import com.google.firebase.auth.AuthResult;
import com.google.firebase.auth.FirebaseAuthInvalidCredentialsException;
import com.google.firebase.auth.FirebaseAuthProvider;
import com.google.firebase.auth.GithubAuthProvider;
import com.google.firebase.auth.PhoneAuthCredential;
import com.google.firebase.auth.PhoneAuthProvider;
@ -1287,7 +1288,7 @@ class RNFirebaseAuth extends ReactContextBaseJavaModule {
for (UserInfo userInfo : providerData) {
// remove 'firebase' provider data - android fb sdk
// should not be returning this as the ios/web ones don't
if (!userInfo.getProviderId().equals("firebase")) {
if (!FirebaseAuthProvider.PROVIDER_ID.equals(userInfo.getProviderId())) {
WritableMap userInfoMap = Arguments.createMap();
userInfoMap.putString("providerId", userInfo.getProviderId());
userInfoMap.putString("uid", userInfo.getUid());
@ -1308,7 +1309,12 @@ class RNFirebaseAuth extends ReactContextBaseJavaModule {
userInfoMap.putNull("phoneNumber");
}
userInfoMap.putString("email", userInfo.getEmail());
// The Android SDK is missing the email property for the email provider, so we use UID instead
if (EmailAuthProvider.PROVIDER_ID.equals(userInfo.getProviderId())) {
userInfoMap.putString("email", userInfo.getUid());
} else {
userInfoMap.putString("email", userInfo.getEmail());
}
output.pushMap(userInfoMap);
}