kylefang/react-native-firebase
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native-firebase.git synced 2026-01-12 22:50:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

[auth] Simplify onAuthStateChanges and interceptUserValue to aid debugging

Browse Source
This commit is contained in:
Chris Bianca
2017-10-27 11:00:06 +01:00
parent f467e2d904
commit 31594756cc
3 changed files with 26 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1312,21 +1312,22 @@ class RNFirebaseAuth extends ReactContextBaseJavaModule {
final Uri photoUrl = userInfo.getPhotoUrl();
if (photoUrl != null) {
if (photoUrl != null && !"".equals(photoUrl)) {
userInfoMap.putString("photoURL", photoUrl.toString());
} else {
userInfoMap.putNull("photoURL");
}
final String phoneNumber = userInfo.getPhoneNumber();
if (phoneNumber != null) {
if (phoneNumber != null && !"".equals(phoneNumber)) {
userInfoMap.putString("phoneNumber", phoneNumber);
} else {
userInfoMap.putNull("phoneNumber");
}
// The Android SDK is missing the email property for the email provider, so we use UID instead
if (EmailAuthProvider.PROVIDER_ID.equals(userInfo.getProviderId())) {
if (EmailAuthProvider.PROVIDER_ID.equals(userInfo.getProviderId())
&& (userInfo.getEmail() == null || "".equals(userInfo.getEmail()))) {
userInfoMap.putString("email", userInfo.getUid());
} else {
userInfoMap.putString("email", userInfo.getEmail());
@@ -1361,25 +1362,25 @@ class RNFirebaseAuth extends ReactContextBaseJavaModule {
userMap.putBoolean("emailVerified", verified);
userMap.putBoolean("isAnonymous", user.isAnonymous());
if (email != null) {
if (email != null && !"".equals(email)) {
userMap.putString("email", email);
} else {
userMap.putNull("email");
}
if (name != null) {
if (name != null && !"".equals(name)) {
userMap.putString("displayName", name);
} else {
userMap.putNull("displayName");
}
if (photoUrl != null) {
if (photoUrl != null && !"".equals(photoUrl)) {
userMap.putString("photoURL", photoUrl.toString());
} else {
userMap.putNull("photoURL");
}
if (phoneNumber != null) {
if (phoneNumber != null && !"".equals(phoneNumber)) {
userMap.putString("phoneNumber", phoneNumber);
} else {
userMap.putNull("phoneNumber");