Move signInWithEmailAndPassword error code logic to the correct location

Author: BrianChapman

src/app/auth/index.ts

@@ -20,21 +20,12 @@ export module auth {
               resolve();
             })
             .catch(err => {
-              let code = 'auth/exception';
-              let message = err.toString();
-              if (message.includes('com.google.firebase.auth.FirebaseAuthInvalidCredentialsException')) {
-                code = 'auth/wrong-password';
-              } else if (message.includes('com.google.firebase.auth.FirebaseAuthInvalidUserException')) {
-                code = 'auth/user-not-found';
-              } else if (message.includes('com.google.firebase.auth.FirebaseAuthInvalidUserException')) {
-                code = 'auth/invalid-email'
-              }
                // Note that auth/user-disabled cannot be identified here because FirebaseAuthInvalidUserException is thrown for both
                // auth/user-disabled and auth/user-not-found
-              reject({
-                code: code,
-                message: message,
-              });
+              reject(
+                // code: "",
+                message: err
+              );
             });
       });
     }
@@ -57,9 +48,23 @@ export module auth {
             user: user,
           });
         }, (err => {
+          {
+            let code = 'auth/exception';
+            let message = err.toString();
+            // Identify code for android. Note that the IOS implementation doesn't return a code.
+            if (message.includes('com.google.firebase.auth.FirebaseAuthInvalidCredentialsException')) {
+              code = 'auth/wrong-password';
+            } else if (message.includes('com.google.firebase.auth.FirebaseAuthInvalidUserException')) {
+              code = 'auth/user-not-found';
+            // Note that Android returns one exception for both user not found and invalid email whereas
+            // the web api returns seperate codes. Therefore the conditional below can never be satisfied
+            // for android.
+            // } else if (message.includes('com.google.firebase.auth.FirebaseAuthInvalidUserException')) {
+            //   code = 'auth/invalid-email'
+          }
           reject({
-            // code: "",
-            message: err
+            code: code,
+            message: message,
           });
         }));
       });