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

[auth][android] Work around for native SDK missing phone number on provider data

This commit is contained in:
Chris Bianca 2017-10-27 11:10:02 +01:00
parent 31594756cc
commit c2d25724ff
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1299,7 +1299,7 @@ class RNFirebaseAuth extends ReactContextBaseJavaModule {
* @param providerData List<UserInfo> user.getProviderData() * @param providerData List<UserInfo> user.getProviderData()
* @return WritableArray array * @return WritableArray array
*/ */
private WritableArray convertProviderData(List<? extends UserInfo> providerData) { private WritableArray convertProviderData(List<? extends UserInfo> providerData, FirebaseUser user) {
WritableArray output = Arguments.createArray(); WritableArray output = Arguments.createArray();
for (UserInfo userInfo : providerData) { for (UserInfo userInfo : providerData) {
// remove 'firebase' provider data - android fb sdk // remove 'firebase' provider data - android fb sdk
@ -1319,7 +1319,13 @@ class RNFirebaseAuth extends ReactContextBaseJavaModule {
} }
final String phoneNumber = userInfo.getPhoneNumber(); final String phoneNumber = userInfo.getPhoneNumber();
if (phoneNumber != null && !"".equals(phoneNumber)) { // The Android SDK is missing the phone number property for the phone provider when the
// user first signs up using their phone number. Use the phone number from the user
// object instead
if (PhoneAuthProvider.PROVIDER_ID.equals(userInfo.getProviderId())
&& (userInfo.getPhoneNumber() == null || "".equals(userInfo.getPhoneNumber()))) {
userInfoMap.putString("phoneNumber", user.getPhoneNumber());
} else if (phoneNumber != null && !"".equals(phoneNumber)) {
userInfoMap.putString("phoneNumber", phoneNumber); userInfoMap.putString("phoneNumber", phoneNumber);
} else { } else {
userInfoMap.putNull("phoneNumber"); userInfoMap.putNull("phoneNumber");
@ -1329,8 +1335,10 @@ class RNFirebaseAuth extends ReactContextBaseJavaModule {
if (EmailAuthProvider.PROVIDER_ID.equals(userInfo.getProviderId()) if (EmailAuthProvider.PROVIDER_ID.equals(userInfo.getProviderId())
&& (userInfo.getEmail() == null || "".equals(userInfo.getEmail()))) { && (userInfo.getEmail() == null || "".equals(userInfo.getEmail()))) {
userInfoMap.putString("email", userInfo.getUid()); userInfoMap.putString("email", userInfo.getUid());
} else { } else if (userInfo.getEmail() != null && !"".equals(userInfo.getEmail())) {
userInfoMap.putString("email", userInfo.getEmail()); userInfoMap.putString("email", userInfo.getEmail());
} else {
userInfoMap.putNull("email");
} }
output.pushMap(userInfoMap); output.pushMap(userInfoMap);
@ -1386,7 +1394,7 @@ class RNFirebaseAuth extends ReactContextBaseJavaModule {
userMap.putNull("phoneNumber"); userMap.putNull("phoneNumber");
} }
userMap.putArray("providerData", convertProviderData(user.getProviderData())); userMap.putArray("providerData", convertProviderData(user.getProviderData(), user));
return userMap; return userMap;
} }