standardise auth messages to match web sdk error messages

Author: Salakar

android/src/main/java/io/fullstack/firestack/auth/FirestackAuth.java

@@ -25,6 +25,7 @@
 import com.google.firebase.auth.UserProfileChangeRequest;
 import com.google.firebase.auth.FacebookAuthProvider;
 import com.google.firebase.auth.FirebaseAuth;
+import com.google.firebase.auth.FirebaseAuthException;
 import com.google.firebase.auth.FirebaseUser;
 import com.google.firebase.auth.GetTokenResult;
 import com.google.firebase.auth.GoogleAuthProvider;
@@ -513,19 +514,15 @@ public void onComplete(@NonNull Task<GetTokenResult> task) {
 
   private void userErrorCallback(Task task, final Callback onFail) {
     WritableMap error = Arguments.createMap();
-    error.putInt("errorCode", task.getException().hashCode());
-    error.putString("errorMessage", task.getException().getMessage());
-    error.putString("allErrorMessage", task.getException().toString());
-
+    error.putString("code", ((FirebaseAuthException)task.getException()).getErrorCode());
+    error.putString("message", task.getException().getMessage());
     onFail.invoke(error);
   }
 
   private void userExceptionCallback(Exception ex, final Callback onFail) {
     WritableMap error = Arguments.createMap();
-    error.putInt("errorCode", ex.hashCode());
-    error.putString("errorMessage", ex.getMessage());
-    error.putString("allErrorMessage", ex.toString());
-
+    error.putInt("code", ex.hashCode());
+    error.putString("message", ex.getMessage());
     onFail.invoke(error);
   }
 

lib/modules/auth.js

@@ -3,7 +3,7 @@ import { NativeModules, NativeEventEmitter } from 'react-native';
 
 import User from './user';
 import { Base } from './base';
-import { promisify } from '../utils';
+import { promisify, toWebSDKErrorCode } from '../utils';
 
 const FirestackAuth = NativeModules.FirestackAuth;
 const FirestackAuthEvt = new NativeEventEmitter(FirestackAuth);
@@ -75,7 +75,7 @@ export default class Auth extends Base {
    */
   createUserWithEmailAndPassword(email: string, password: string): Promise<Object> {
     this.log.info('Creating user with email and password', email);
-    return promisify('createUserWithEmail', FirestackAuth)(email, password);
+    return promisify('createUserWithEmail', FirestackAuth, 'auth/')(email, password);
   }
 
   /**
@@ -86,7 +86,7 @@ export default class Auth extends Base {
    */
   signInWithEmailAndPassword(email: string, password: string): Promise<Object> {
     this.log.info('Signing in user with email and password', email);
-    return promisify('signInWithEmail', FirestackAuth)(email, password);
+    return promisify('signInWithEmail', FirestackAuth, 'auth/')(email, password);
   }
 
   // TODO move user methods to User class
@@ -97,14 +97,14 @@ export default class Auth extends Base {
    * @return {Promise}       A promise resolved upon completion
    */
   updateEmail(email: string): Promise<Object> {
-    return promisify('updateUserEmail', FirestackAuth)(email);
+    return promisify('updateUserEmail', FirestackAuth, 'auth/')(email);
   }
 
   /**
    * Send verification email to current user.
    */
   sendEmailVerification(): Promise<Object> {
-    return promisify('sendEmailVerification', FirestackAuth)();
+    return promisify('sendEmailVerification', FirestackAuth, 'auth/')();
   }
 
   /**
@@ -113,7 +113,7 @@ export default class Auth extends Base {
    * @return {Promise}
    */
   updatePassword(password: string): Promise<Object> {
-    return promisify('updateUserPassword', FirestackAuth)(password);
+    return promisify('updateUserPassword', FirestackAuth, 'auth/')(password);
   }
 
   /**
@@ -122,7 +122,7 @@ export default class Auth extends Base {
    * @return {Promise}
    */
   updateProfile(updates: Object = {}): Promise<Object> {
-    return promisify('updateUserProfile', FirestackAuth)(updates);
+    return promisify('updateUserProfile', FirestackAuth, 'auth/')(updates);
   }
 
   /**
@@ -139,47 +139,47 @@ export default class Auth extends Base {
    * @return {Promise}           A promise resolved upon completion
    */
   signInWithCredential(credential: CredentialType): Promise<Object> {
-    return promisify('signInWithProvider', FirestackAuth)(credential.provider, credential.token, credential.secret);
+    return promisify('signInWithProvider', FirestackAuth, 'auth/')(credential.provider, credential.token, credential.secret);
   }
 
   /**
    * Re-authenticate a user with a third-party authentication provider
    * @return {Promise}         A promise resolved upon completion
    */
   reauthenticateUser(credential: CredentialType): Promise<Object> {
-    return promisify('reauthenticateWithCredentialForProvider', FirestackAuth)(credential.provider, credential.token, credential.secret);
+    return promisify('reauthenticateWithCredentialForProvider', FirestackAuth, 'auth/')(credential.provider, credential.token, credential.secret);
   }
 
   /**
    * Sign a user in anonymously
    * @return {Promise}            A promise resolved upon completion
    */
   signInAnonymously(): Promise<Object> {
-    return promisify('signInAnonymously', FirestackAuth)();
+    return promisify('signInAnonymously', FirestackAuth, 'auth/')();
   }
 
   /**
    * Send reset password instructions via email
    * @param {string} email The email to send password reset instructions
    */
   sendPasswordResetEmail(email: string): Promise<Object> {
-    return promisify('sendPasswordResetWithEmail', FirestackAuth)(email);
+    return promisify('sendPasswordResetWithEmail', FirestackAuth, 'auth/')(email);
   }
 
   /**
    * Delete the current user
    * @return {Promise}
    */
   deleteUser(): Promise<Object> {
-    return promisify('deleteUser', FirestackAuth)();
+    return promisify('deleteUser', FirestackAuth, 'auth/')();
   }
 
   /**
    * get the token of current user
    * @return {Promise}
    */
   getToken(): Promise<Object> {
-    return promisify('getToken', FirestackAuth)();
+    return promisify('getToken', FirestackAuth, 'auth/')();
   }
 
 
@@ -188,15 +188,15 @@ export default class Auth extends Base {
    * @return {Promise}
    */
   signOut(): Promise<Object> {
-    return promisify('signOut', FirestackAuth)();
+    return promisify('signOut', FirestackAuth, 'auth/')();
   }
 
   /**
    * Get the currently signed in user
    * @return {Promise}
    */
   getCurrentUser(): Promise<Object> {
-    return promisify('getCurrentUser', FirestackAuth)();
+    return promisify('getCurrentUser', FirestackAuth, 'auth/')();
   }
 
   /**

lib/utils/index.js

@@ -4,14 +4,18 @@ const hasOwnProperty = Object.hasOwnProperty;
 const DEFAULT_CHUNK_SIZE = 50;
 
 // internal promise handler
-const _handler = (resolve, reject, err, resp) => {
+const _handler = (resolve, reject, errorPrefix, err, resp) => {
   // resolve / reject after events etc
   setImmediate(() => {
-    if (err) return reject(err);
+    if (err) return reject(errorPrefix ? { code: toWebSDKErrorCode(err.code), message: err.message } : err);
     return resolve(resp);
   });
 };
 
+export function toWebSDKErrorCode(code, prefix) {
+  return code.toLowerCase().replace('error_', prefix).replace(/_/g, '-');
+}
+
 /**
  * Deep get a value from an object.
  * @website https://github.com/Salakar/deeps
@@ -131,13 +135,14 @@ export function noop(): void {
  * Wraps a native module method to support promises.
  * @param fn
  * @param NativeModule
+ * @param errorPrefix
  */
-export function promisify(fn: Function, NativeModule: Object): Function<Promise> {
+export function promisify(fn: Function, NativeModule: Object, errorPrefix): Function<Promise> {
   return (...args) => {
     return new Promise((resolve, reject) => {
       const _fn = typeof fn === 'function' ? fn : NativeModule[fn];
       if (!_fn || typeof _fn !== 'function') return reject(new Error('Missing function for promisify.'));
-      return _fn.apply(NativeModule, [...args, _handler.bind(_handler, resolve, reject)]);
+      return _fn.apply(NativeModule, [...args, _handler.bind(_handler, resolve, reject, errorPrefix)]);
     });
   };
 }