start of refactor - will add a detailed commit log on PR.

Author: Salakar

android/.idea/gradle.xml

@@ -20,7 +20,7 @@ android {
 
 dependencies {
     compile 'com.facebook.react:react-native:0.20.+'
-    compile 'com.google.android.gms:play-services-base:9.8.0'
+    compile 'com.google.android.gms:play-services-base:9.8.1'
 
     compile 'com.google.firebase:firebase-core:9.8.0'
     compile 'com.google.firebase:firebase-auth:9.8.0'

android/build.gradle

@@ -49,7 +49,7 @@ export class Firestack extends Singleton {
     delete instance.options.remoteConfig;
 
     instance.configured = instance.options.configure || false;
-    instance.auth = null;
+    instance._auth = null;
 
     instance.eventHandlers = {};
 
@@ -104,6 +104,7 @@ export class Firestack extends Singleton {
    * idea or not (imperative vs. direct manipulation/proxy)
    */
   auth() {
+    console.log('auth GET');
     if (!this._auth) {
       this._auth = new Authentication(this);
     }

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

@@ -1,27 +1,59 @@
-
-import {NativeModules, NativeEventEmitter} from 'react-native';
+import { NativeModules, NativeEventEmitter } from 'react-native';
 const FirestackAuth = NativeModules.FirestackAuth
 const FirestackAuthEvt = new NativeEventEmitter(FirestackAuth);
 
+
 import promisify from '../utils/promisify'
 import { Base } from './base'
+import { default as User} from './user';
 
 export class Authentication extends Base {
-  constructor(firestack, options={}) {
+  constructor(firestack, options = {}) {
     super(firestack, options);
+    this._authResult = null;
+    this.authenticated = false;
+    this._user = null;
+
+    // always track auth changes internall so we can access them synchronously
+    FirestackAuthEvt.addListener('listenForAuth', this._onAuthStateChanged.bind(this));
+    FirestackAuth.listenForAuth();
   }
 
-  // Auth
-  listenForAuth(callback) {
-    this.log.info('Setting up listenForAuth callback');
-    const sub = this._on('listenForAuth', callback, FirestackAuthEvt);
+  /**
+   * Internal auth changed listener
+   * @param auth
+   * @private
+   */
+  _onAuthStateChanged(auth) {
+    this._authResult = auth;
+    this.authenticated = auth ? auth.authenticated || false : false
+    if (auth && !this._user) this._user = new User(this, auth);
+    else if (!auth && this._user) this._user = null;
+    else this._user._updateValues(auth);
+  }
+
+  /*
+   * WEB API
+   */
+
+  /**
+   * Listen for auth changes.
+   * @param callback
+   */
+  onAuthStateChanged(listener) {
+    this.log.info('Creating onAuthStateChanged listener');
+    const sub = this._on('listenForAuth', listener, FirestackAuthEvt);
     FirestackAuth.listenForAuth();
-    this.log.info('Listening for auth...');
+    this.log.info('Listening for onAuthStateChanged events...');
     return promisify(() => sub, FirestackAuth)(sub);
   }
 
-  unlistenForAuth() {
-    this.log.info('Unlistening for auth');
+  /**
+   * Remove auth change listener
+   * @param listener
+   */
+  offAuthStateChanged(listener) {
+    this.log.info('Removing onAuthStateChanged listener');
     this._off('listenForAuth');
     return promisify('unlistenForAuth', FirestackAuth)();
   }
@@ -32,8 +64,8 @@ export class Authentication extends Base {
    * @param  {string} password The user's password
    * @return {Promise}         A promise indicating the completion
    */
-  createUserWithEmail(email, password) {
-    this.log.info('Creating user with email', email);
+  createUserWithEmailAndPassword(email, password) {
+    this.log.info('Creating user with email and password', email);
     return promisify('createUserWithEmail', FirestackAuth)(email, password);
   }
 
@@ -43,19 +75,44 @@ export class Authentication extends Base {
    * @param  {string} password The user's password
    * @return {Promise}         A promise that is resolved upon completion
    */
-  signInWithEmail(email, password) {
+  signInWithEmailAndPassword(email, password) {
+    this.log.info('Signing in user with email and password', email);
     return promisify('signInWithEmail', FirestackAuth)(email, password)
   }
 
+
   /**
-   * Sign the user in with a third-party authentication provider
-   * @param  {string} provider   The name of the provider to use for login
-   * @param  {string} authToken  The authToken granted by the provider
-   * @param  {string} authSecret The authToken secret granted by the provider
-   * @return {Promise}           A promise resolved upon completion
+   * Update the current user's email
+   * @param  {string} email The user's _new_ email
+   * @return {Promise}       A promise resolved upon completion
    */
-  signInWithProvider(provider, authToken, authSecret) {
-    return promisify('signInWithProvider', FirestackAuth)(provider, authToken, authSecret)
+  updateEmail(email) {
+    return promisify('updateUserEmail', FirestackAuth)(email);
+  }
+
+  /**
+   * Send verification email to current user.
+   */
+  sendEmailVerification() {
+    return promisify('sendEmailVerification', FirestackAuth)();
+  }
+
+  /**
+   * Update the current user's password
+   * @param  {string} email the new password
+   * @return {Promise}
+   */
+  updatePassword(password) {
+    return promisify('updateUserPassword', FirestackAuth)(password);
+  }
+
+  /**
+   * Update the current user's profile
+   * @param  {Object} obj An object containing the keys listed [here](https://firebase.google.com/docs/auth/ios/manage-users#update_a_users_profile)
+   * @return {Promise}
+   */
+  updateProfile(updates) {
+    return promisify('updateUserProfile', FirestackAuth)(updates);
   }
 
   /**
@@ -68,11 +125,14 @@ export class Authentication extends Base {
   }
 
   /**
-   * Sign a user in anonymously
-   * @return {Promise}            A promise resolved upon completion
+   * Sign the user in with a third-party authentication provider
+   * @param  {string} provider   The name of the provider to use for login
+   * @param  {string} authToken  The authToken granted by the provider
+   * @param  {string} authSecret The authToken secret granted by the provider
+   * @return {Promise}           A promise resolved upon completion
    */
-  signInAnonymously() {
-    return promisify('signInAnonymously', FirestackAuth)();
+  signInWithProvider(provider, authToken, authSecret) {
+    return promisify('signInWithProvider', FirestackAuth)(provider, authToken, authSecret)
   }
 
   /**
@@ -86,22 +146,72 @@ export class Authentication extends Base {
     return promisify('reauthenticateWithCredentialForProvider', FirestackAuth)(provider, token, secret)
   }
 
+
   /**
-   * Update the current user's email
-   * @param  {string} email The user's _new_ email
-   * @return {Promise}       A promise resolved upon completion
+   * Sign a user in anonymously
+   * @return {Promise}            A promise resolved upon completion
    */
-  updateUserEmail(email) {
-    return promisify('updateUserEmail', FirestackAuth)(email);
+  signInAnonymously() {
+    return promisify('signInAnonymously', FirestackAuth)();
   }
 
+
+  /*
+   * Old deprecated api stubs
+   */
+
+
   /**
-   * Update the current user's password
-   * @param  {string} email the new password
-   * @return {Promise}
+   * @deprecated
+   * @param args
    */
-  updatePassword(password) {
-    return promisify('updateUserPassword', FirestackAuth)(password);
+  listenForAuth(...args) {
+    console.warn('Firestack: listenForAuth is now deprecated, please use onAuthStateChanged');
+    this.onAuthStateChanged(...args);
+  }
+
+  /**
+   * @deprecated
+   * @param args
+   */
+  unlistenForAuth(...args) {
+    console.warn('Firestack: unlistenForAuth is now deprecated, please use offAuthStateChanged');
+    this.offAuthStateChanged(...args);
+  }
+
+  /**
+   * Create a user with the email/password functionality
+   * @deprecated
+   * @param  {string} email    The user's email
+   * @param  {string} password The user's password
+   * @return {Promise}         A promise indicating the completion
+   */
+  createUserWithEmail(...args) {
+    console.warn('Firestack: createUserWithEmail is now deprecated, please use createUserWithEmailAndPassword');
+    this.createUserWithEmailAndPassword(...args);
+  }
+
+  /**
+   * Sign a user in with email/password
+   * @deprecated
+   * @param  {string} email    The user's email
+   * @param  {string} password The user's password
+   * @return {Promise}         A promise that is resolved upon completion
+   */
+  signInWithEmail(...args) {
+    console.warn('Firestack: signInWithEmail is now deprecated, please use signInWithEmailAndPassword');
+    this.signInWithEmailAndPassword(...args);
+  }
+
+  /**
+   * Update the current user's email
+   * @deprecated
+   * @param  {string} email The user's _new_ email
+   * @return {Promise}       A promise resolved upon completion
+   */
+  updateUserEmail(...args) {
+    console.warn('Firestack: updateUserEmail is now deprecated, please use updateEmail');
+    this.updateEmail(...args);
   }
 
   /**
@@ -119,6 +229,7 @@ export class Authentication extends Base {
   deleteUser() {
     return promisify('deleteUser', FirestackAuth)()
   }
+
   /**
    * get the token of current user
    * @return {Promise}
@@ -129,11 +240,13 @@ export class Authentication extends Base {
 
   /**
    * Update the current user's profile
+   * @deprecated
    * @param  {Object} obj An object containing the keys listed [here](https://firebase.google.com/docs/auth/ios/manage-users#update_a_users_profile)
    * @return {Promise}
    */
-  updateUserProfile(obj) {
-    return promisify('updateUserProfile', FirestackAuth)(obj);
+  updateUserProfile(...args) {
+    console.warn('Firestack: updateUserProfile is now deprecated, please use updateProfile');
+    this.updateProfile(...args);
   }
 
   /**
@@ -148,8 +261,8 @@ export class Authentication extends Base {
    * Get the currently signed in user
    * @return {Promise}
    */
-  getCurrentUser() {
-    return promisify('getCurrentUser', FirestackAuth)();
+  get currentUser() {
+    return this._user;
   }
 
   get namespace() {

lib/firestack.js

@@ -3,15 +3,18 @@
  */
 import Log from '../utils/log'
 
-import {NativeModules, NativeEventEmitter, AsyncStorage} from 'react-native';
+import { NativeModules, NativeEventEmitter, AsyncStorage } from 'react-native';
+import { default as EventEmitter } from './../utils/eventEmitter';
+
 const FirestackModule = NativeModules.Firestack;
 const FirestackModuleEvt = new NativeEventEmitter(FirestackModule);
 
 import promisify from '../utils/promisify'
 
 let logs = {};
-export class Base {
-  constructor(firestack, options={}) {
+export class Base extends EventEmitter {
+  constructor(firestack, options = {}) {
+    super();
     this.firestack = firestack;
     this.eventHandlers = {};
 
@@ -88,13 +91,13 @@ export class ReferenceBase extends Base {
     super(firestack);
 
     this.path = Array.isArray(path) ?
-                      path :
-                      (typeof path == 'string' ?
-                        [path] : []);
+      path :
+      (typeof path == 'string' ?
+        [path] : []);
 
     // sanitize path, just in case
     this.path = this.path
-                    .filter(str => str !== "" );
+      .filter(str => str !== "");
   }
 
   get key() {
@@ -110,4 +113,4 @@ export class ReferenceBase extends Base {
     }
     return pathStr;
   }
-}
+}