Merge branch 'master' of github.com:fullstackreact/react-native-firestack

* 'master' of github.com:fullstackreact/react-native-firestack:
  Cleanup listeners and add a little bit of documentation
  Remove auth methods from instance root & update documentation
  Fix Java Database Listeners
  Fix listeners getting called when it's not their turn
  Android: Fix .on() listeners not getting removed / called immediately on setup
  Upgrade google play services and firebase to 9.8.0
  Android: fix userMap not being used in userCallback & anonymousUserCallback
  Fix passedUser not being used, make it more clear what user is being used

Author: auser

Diff for: README.md

@@ -280,12 +280,14 @@ All methods return a promise.
 
 Firestack handles authentication for us out of the box, both with email/password-based authentication and through oauth providers (with a separate library to handle oauth providers).
 
+> Android requires the Google Play services to installed for authentication to function.
+
 #### listenForAuth()
 
 Firebase gives us a reactive method for listening for authentication. That is we can set up a listener to call a method when the user logs in and out. To set up the listener, call the `listenForAuth()` method:
 
 ```javascript
-firestack.listenForAuth(function(evt) {
+firestack.auth.listenForAuth(function(evt) {
   // evt is the authentication event
   // it contains an `error` key for carrying the
   // error message in case of an error
@@ -306,15 +308,15 @@ firestack.listenForAuth(function(evt) {
 We can remove this listener by calling the `unlistenForAuth()` method. This is important to release resources from our app when we don't need to hold on to the listener any longer.
 
 ```javascript
-firestack.unlistenForAuth()
+firestack.auth.unlistenForAuth()
 ```
 
 #### createUserWithEmail()
 
 We can create a user by calling the `createUserWithEmail()` function. The `createUserWithEmail()` accepts two parameters, an email and a password.
 
 ```javascript
-firestack.createUserWithEmail('[email protected]', '123456')
+firestack.auth.createUserWithEmail('[email protected]', '123456')
   .then((user) => {
     console.log('user created', user)
   })
@@ -342,7 +344,7 @@ firestack.auth.signInWithEmail('[email protected]', '123456')
 To sign a user using a self-signed custom token, use the `signInWithCustomToken()` function. It accepts one parameter, the custom token:
 
 ```javascript
-firestack.signInWithCustomToken(TOKEN)
+firestack.auth.signInWithCustomToken(TOKEN)
   .then((user) => {
     console.log('User successfully logged in', user)
   })
@@ -397,7 +399,7 @@ When the auth token has expired, we can ask firebase to reauthenticate with the
 We can update the current user's email by using the command: `updateUserEmail()`. It accepts a single argument: the user's new email:
 
 ```javascript
-firestack.updateUserEmail('[email protected]')
+firestack.auth.updateUserEmail('[email protected]')
   .then((res) => console.log('Updated user email'))
   .catch(err => console.error('There was an error updating user email'))
 ```
@@ -407,7 +409,7 @@ firestack.updateUserEmail('[email protected]')
 We can update the current user's password using the `updateUserPassword()` method. It accepts a single parameter: the new password for the current user
 
 ```javascript
-firestack.updateUserPassword('somethingReallyS3cr3t733t')
+firestack.auth.updateUserPassword('somethingReallyS3cr3t733t')
   .then(res => console.log('Updated user password'))
   .catch(err => console.error('There was an error updating your password'))
 ```
@@ -417,7 +419,7 @@ firestack.updateUserPassword('somethingReallyS3cr3t733t')
 To send a password reset for a user based upon their email, we can call the `sendPasswordResetWithEmail()` method. It accepts a single parameter: the email of the user to send a reset email.
 
 ```javascript
-firestack.sendPasswordResetWithEmail('[email protected]')
+firestack.auth.sendPasswordResetWithEmail('[email protected]')
   .then(res => console.log('Check your inbox for further instructions'))
   .catch(err => console.error('There was an error :('))
 ```
@@ -431,7 +433,7 @@ It accepts a single parameter:
 * object which contains updated key/values for the user's profile. Possible keys are listed [here](https://firebase.google.com/docs/auth/ios/manage-users#update_a_users_profile).
 
 ```javascript
-firestack.updateUserProfile({
+firestack.auth.updateUserProfile({
   displayName: 'Ari Lerner'
 })
   .then(res => console.log('Your profile has been updated'))
@@ -443,7 +445,7 @@ firestack.updateUserProfile({
 It's possible to delete a user completely from your account on Firebase. Calling the `deleteUser()` method will take care of this for you.
 
 ```javascript
-firestack.deleteUser()
+firestack.auth.deleteUser()
 .then(res => console.log('Sad to see you go'))
 .catch(err => console.error('There was an error - Now you are trapped!'))
 ```
@@ -453,7 +455,7 @@ firestack.deleteUser()
 If you want user's token, use `getToken()` method.
 
 ```javascript
-firestack.getToken()
+firestack.auth.getToken()
 .then(res => console.log(res.token))
 .catch(err => console.error('error'))
 ```
@@ -463,7 +465,7 @@ firestack.getToken()
 To sign the current user out, use the `signOut()` method. It accepts no parameters
 
 ```javascript
-firestack.signOut()
+firestack.auth.signOut()
 .then(res => console.log('You have been signed out'))
 .catch(err => console.error('Uh oh... something weird happened'))
 ```
@@ -473,7 +475,7 @@ firestack.signOut()
 Although you _can_ get the current user using the `getCurrentUser()` method, it's better to use this from within the callback function provided by `listenForAuth()`. However, if you need to get the current user, call the `getCurrentUser()` method:
 
 ```javascript
-firestack.getCurrentUser()
+firestack.auth.getCurrentUser()
 .then(user => console.log('The currently logged in user', user))
 .catch(err => console.error('An error occurred'))
 ```

Diff for: android/build.gradle

@@ -20,13 +20,13 @@ android {
 
 dependencies {
     compile 'com.facebook.react:react-native:0.20.+'
-    compile 'com.google.android.gms:play-services-base:9.6.1'
+    compile 'com.google.android.gms:play-services-base:9.8.0'
 
-    compile 'com.google.firebase:firebase-core:9.6.0'
-    compile 'com.google.firebase:firebase-auth:9.6.0'
-    compile 'com.google.firebase:firebase-analytics:9.6.0'
-    compile 'com.google.firebase:firebase-database:9.6.0'
-    compile 'com.google.firebase:firebase-storage:9.6.0'
-    compile 'com.google.firebase:firebase-messaging:9.6.0'
+    compile 'com.google.firebase:firebase-core:9.8.0'
+    compile 'com.google.firebase:firebase-auth:9.8.0'
+    compile 'com.google.firebase:firebase-analytics:9.8.0'
+    compile 'com.google.firebase:firebase-database:9.8.0'
+    compile 'com.google.firebase:firebase-storage:9.8.0'
+    compile 'com.google.firebase:firebase-messaging:9.8.0'
 }
 

Diff for: android/src/main/java/io/fullstack/firestack/FirestackAuth.java

@@ -68,7 +68,7 @@ public void onAuthStateChanged(@NonNull FirebaseAuth firebaseAuth) {
         WritableMap msgMap = Arguments.createMap();
         msgMap.putString("eventName", "listenForAuth");
 
-        if (user != null) {
+        if (FirestackAuthModule.this.user != null) {
             WritableMap userMap = getUserMap();
 
             msgMap.putBoolean("authenticated", true);
@@ -107,8 +107,8 @@ public void createUserWithEmail(final String email, final String password, final
                   @Override
                   public void onComplete(@NonNull Task<AuthResult> task) {
                       if (task.isSuccessful()) {
-                          user = task.getResult().getUser();
-                          userCallback(user, onComplete);
+                          FirestackAuthModule.this.user = task.getResult().getUser();
+                          userCallback(FirestackAuthModule.this.user, onComplete);
                       }else{
                           userErrorCallback(task, onComplete);
                       }
@@ -125,8 +125,8 @@ public void signInWithEmail(final String email, final String password, final Cal
               @Override
               public void onComplete(@NonNull Task<AuthResult> task) {
                   if (task.isSuccessful()) {
-                      user = task.getResult().getUser();
-                      userCallback(user, callback);
+                      FirestackAuthModule.this.user = task.getResult().getUser();
+                      userCallback(FirestackAuthModule.this.user, callback);
                   } else {
                       userErrorCallback(task, callback);
                   }
@@ -156,8 +156,8 @@ public void onComplete(@NonNull Task<AuthResult> task) {
                         Log.d(TAG, "signInAnonymously:onComplete:" + task.isSuccessful());
 
                         if (task.isSuccessful()) {
-                            user = task.getResult().getUser();
-                            anonymousUserCallback(user, callback);
+                            FirestackAuthModule.this.user = task.getResult().getUser();
+                            anonymousUserCallback(FirestackAuthModule.this.user, callback);
                         }else{
                             userErrorCallback(task, callback);
                         }
@@ -176,8 +176,8 @@ public void signInWithCustomToken(final String customToken, final Callback callb
             public void onComplete(@NonNull Task<AuthResult> task) {
                 Log.d(TAG, "signInWithCustomToken:onComplete:" + task.isSuccessful());
                 if (task.isSuccessful()) {
-                    user = task.getResult().getUser();
-                    userCallback(user, callback);
+                    FirestackAuthModule.this.user = task.getResult().getUser();
+                    userCallback(FirestackAuthModule.this.user, callback);
                 } else {
                     userErrorCallback(task, callback);
                 }
@@ -356,7 +356,7 @@ public void onComplete(@NonNull Task<Void> task) {
     @ReactMethod
     public void signOut(final Callback callback) {
       FirebaseAuth.getInstance().signOut();
-      user = null;
+      this.user = null;
 
       WritableMap resp = Arguments.createMap();
       resp.putString("status", "complete");
@@ -368,11 +368,11 @@ public void signOut(final Callback callback) {
     public void getCurrentUser(final Callback callback) {
         mAuth = FirebaseAuth.getInstance();
 
-        user = mAuth.getCurrentUser();
-        if(user == null){
+        this.user = mAuth.getCurrentUser();
+        if(this.user == null){
             noUserCallback(callback);
         }else{
-            userCallback(user, callback);
+            userCallback(this.user, callback);
         }
     }
 
@@ -387,8 +387,8 @@ public void googleLogin(String IdToken, final Callback callback) {
                     @Override
                     public void onComplete(@NonNull Task<AuthResult> task) {
                         if (task.isSuccessful()) {
-                            user = task.getResult().getUser();
-                            userCallback(user, callback);
+                            FirestackAuthModule.this.user = task.getResult().getUser();
+                            userCallback(FirestackAuthModule.this.user, callback);
                         }else{
                             userErrorCallback(task, callback);
                         }
@@ -406,8 +406,8 @@ public void facebookLogin(String Token, final Callback callback) {
                     @Override
                     public void onComplete(@NonNull Task<AuthResult> task) {
                         if (task.isSuccessful()) {
-                            user = task.getResult().getUser();
-                            userCallback(user, callback);
+                            FirestackAuthModule.this.user = task.getResult().getUser();
+                            userCallback(FirestackAuthModule.this.user, callback);
                         }else{
                             userErrorCallback(task, callback);
                         }
@@ -417,26 +417,24 @@ public void onComplete(@NonNull Task<AuthResult> task) {
 
     // Internal helpers
     public void userCallback(FirebaseUser passedUser, final Callback onComplete) {
-        WritableMap userMap = getUserMap();
 
         if (passedUser == null) {
           mAuth = FirebaseAuth.getInstance();
-          final FirebaseUser user = mAuth.getCurrentUser();
+          this.user = mAuth.getCurrentUser();
         } else {
-          final FirebaseUser user = passedUser;
+          this.user = passedUser;
         }
 
-        user.getToken(true).addOnCompleteListener(new OnCompleteListener<GetTokenResult>() {
+        this.user.getToken(true).addOnCompleteListener(new OnCompleteListener<GetTokenResult>() {
             @Override
             public void onComplete(@NonNull Task<GetTokenResult> task) {
-              WritableMap msgMap = Arguments.createMap();
-                WritableMap userMap = Arguments.createMap();
-
-                if (user != null) {
-                  final String token = task.getResult().getToken();
+                WritableMap msgMap = Arguments.createMap();
+                WritableMap userMap = getUserMap();
+                if (FirestackAuthModule.this.user != null) {
+                    final String token = task.getResult().getToken();
 
-                  userMap.putString("token", token);
-                  userMap.putBoolean("anonymous", false);
+                    userMap.putString("token", token);
+                    userMap.putBoolean("anonymous", false);
                 }
 
                 msgMap.putMap("user", userMap);
@@ -448,26 +446,25 @@ public void onComplete(@NonNull Task<GetTokenResult> task) {
 
     // TODO: Reduce to one method
     public void anonymousUserCallback(FirebaseUser passedUser, final Callback onComplete) {
-        WritableMap userMap = getUserMap();
 
         if (passedUser == null) {
           mAuth = FirebaseAuth.getInstance();
-          final FirebaseUser user = mAuth.getCurrentUser();
+          this.user = mAuth.getCurrentUser();
         } else {
-          final FirebaseUser user = passedUser;
+          this.user = passedUser;
         }
 
-        user.getToken(true).addOnCompleteListener(new OnCompleteListener<GetTokenResult>() {
+        this.user.getToken(true).addOnCompleteListener(new OnCompleteListener<GetTokenResult>() {
             @Override
             public void onComplete(@NonNull Task<GetTokenResult> task) {
-              WritableMap msgMap = Arguments.createMap();
-                WritableMap userMap = Arguments.createMap();
+                WritableMap msgMap = Arguments.createMap();
+                WritableMap userMap = getUserMap();
 
-                if (user != null) {
-                  final String token = task.getResult().getToken();
+                if (FirestackAuthModule.this.user != null) {
+                    final String token = task.getResult().getToken();
 
-                  userMap.putString("token", token);
-                  userMap.putBoolean("anonymous", true);
+                    userMap.putString("token", token);
+                    userMap.putBoolean("anonymous", true);
                 }
 
                 msgMap.putMap("user", userMap);