handle email error on android

Author: Cedric

Diff for: packages/app/android/src/reactnative/java/io/invertase/firebase/common/ReactNativeFirebaseModule.java

@@ -54,6 +54,15 @@ public static void rejectPromiseWithCodeAndMessage(
     promise.reject(code, message, userInfoMap);
   }
 
+  public static void rejectPromiseWithMap(
+      Promise promise, String code, String message, ReadableMap map) {
+    WritableMap userInfoMap = Arguments.createMap();
+    userInfoMap.putString("code", code);
+    userInfoMap.putString("message", message);
+    userInfoMap.merge(map);
+    promise.reject(code, message, userInfoMap);
+  }
+
   public static void rejectPromiseWithCodeAndMessage(Promise promise, String code, String message) {
     WritableMap userInfoMap = Arguments.createMap();
     userInfoMap.putString("code", code);

Diff for: packages/app/lib/index.d.ts

@@ -42,6 +42,11 @@ export namespace ReactNativeFirebase {
      */
     readonly message: string;
 
+    /**
+     * The email address of the user's account used in the operation that triggered the error, if applicable
+     */
+    readonly email?: string;
+
     /**
      * The firebase module namespace that this error originated from, e.g. 'analytics'
      */

Diff for: packages/app/lib/internal/NativeFirebaseError.js

@@ -39,6 +39,15 @@ export default class NativeFirebaseError extends Error {
       value: `[${this.code}] ${userInfo.message || nativeError.message}`,
     });
 
+    if (typeof userInfo === 'object' && userInfo !== null) {
+      if ('email' in userInfo) {
+        Object.defineProperty(this, 'email', {
+          enumerable: true,
+          value: userInfo.email,
+        });
+      }
+    }
+
     Object.defineProperty(this, 'jsStack', {
       enumerable: false,
       value: jsStack,

Diff for: packages/auth/android/src/main/java/io/invertase/firebase/auth/ReactNativeFirebaseAuthModule.java

@@ -46,6 +46,7 @@
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseAuthException;
 import com.google.firebase.auth.FirebaseAuthInvalidCredentialsException;
+import com.google.firebase.auth.FirebaseAuthUserCollisionException;
 import com.google.firebase.auth.FirebaseAuthMultiFactorException;
 import com.google.firebase.auth.FirebaseAuthProvider;
 import com.google.firebase.auth.FirebaseAuthSettings;
@@ -845,9 +846,12 @@ private void signInWithCredential(
   @ReactMethod
   public void signInWithProvider(String appName, String providerId, @Nullable String email, Promise promise){
     OAuthProvider.Builder provider = OAuthProvider.newBuilder(providerId);
+
     if(email != null){
       provider.addCustomParameter("login_hint", email);
     }
+    provider.addCustomParameter("prompt", "select_account");
+
     Activity activity = getCurrentActivity();
     FirebaseApp firebaseApp = FirebaseApp.getInstance(appName);
     FirebaseAuth firebaseAuth = FirebaseAuth.getInstance(firebaseApp);
@@ -885,9 +889,12 @@ public void onFailure(@NonNull Exception e) {
   @ReactMethod
   public void linkWithProvider(String appName, String providerId, @Nullable String email, Promise promise){
     OAuthProvider.Builder provider = OAuthProvider.newBuilder(providerId);
+
     if(email != null){
       provider.addCustomParameter("login_hint", email);
     }
+    provider.addCustomParameter("prompt", "select_account");
+
     Activity activity = getCurrentActivity();
     FirebaseApp firebaseApp = FirebaseApp.getInstance(appName);
     FirebaseAuth firebaseAuth = FirebaseAuth.getInstance(firebaseApp);
@@ -1954,7 +1961,7 @@ private void promiseWithAuthResult(AuthResult authResult, Promise promise) {
         if(authResult.getCredential() instanceof OAuthCredential){
           OAuthCredential creds = (OAuthCredential) authResult.getCredential();
           WritableMap credentialMap = Arguments.createMap();
-          
+
           credentialMap.putString("providerId", creds.getProvider());
           credentialMap.putString("signInMethod", creds.getSignInMethod());
 
@@ -2014,15 +2021,23 @@ private void promiseWithAuthResult(AuthResult authResult, Promise promise) {
    */
   private void promiseRejectAuthException(Promise promise, Exception exception) {
     WritableMap error = getJSError(exception);
-    
+
     final String sessionId = error.getString("sessionId");
     final MultiFactorResolver multiFactorResolver = mCachedResolvers.get(sessionId);
     WritableMap resolverAsMap = Arguments.createMap();
+
+    WritableMap map = Arguments.createMap();
     if (multiFactorResolver != null) {
       resolverAsMap = resolverToMap(sessionId, multiFactorResolver);
+      map.putMap("resolver", resolverAsMap);
     }
-    rejectPromiseWithCodeAndMessage(
-        promise, error.getString("code"), error.getString("message"), resolverAsMap);
+
+    if(error.getString("email") != null){
+      map.putString("email", error.getString("email"));
+    }
+
+    rejectPromiseWithMap(
+        promise, error.getString("code"), error.getString("message"), map);
   }
 
   /**
@@ -2037,7 +2052,6 @@ private WritableMap getJSError(Exception exception) {
     String invalidEmail = "The email address is badly formatted.";
 
     System.out.print(exception);
-
     try {
       FirebaseAuthException authException = (FirebaseAuthException) exception;
       code = authException.getErrorCode();
@@ -2073,7 +2087,7 @@ private WritableMap getJSError(Exception exception) {
                     + " before retrying this request.";
             break;
           case "ACCOUNT_EXISTS_WITH_DIFFERENT_CREDENTIAL":
-            message =
+          message =
                 "An account already exists with the same email address but different sign-in"
                     + " credentials. Sign in using a provider associated with this email address.";
             break;
@@ -2111,6 +2125,10 @@ private WritableMap getJSError(Exception exception) {
       }
     }
 
+    if(exception instanceof FirebaseAuthUserCollisionException) {
+      error.putString("email", ((FirebaseAuthUserCollisionException) exception).getEmail());
+    }
+
     if (exception instanceof FirebaseAuthMultiFactorException) {
       final FirebaseAuthMultiFactorException multiFactorException =
           (FirebaseAuthMultiFactorException) exception;