Merge remote-tracking branch 'origin/master'

Author: Salakar

docs/api/authentication.md

@@ -26,7 +26,7 @@ class Example extends React.Component {
   }
 
   componentDidMount() {
-    this.unsubscribe = firebase.auth().onAuthStateChanged((user) => {
+    this.unsubscribe = firestack.auth().onAuthStateChanged((user) => {
       if (user) {
         // User is signed in.
       }

ios/Firestack/FirestackAuth.m

@@ -137,7 +137,7 @@ @implementation FirestackAuth
                                              sendJSEvent:AUTH_CHANGED_EVENT
                                              props: @{
                                                       @"eventName": @"userTokenError",
-                                                      @"msg": [error localizedFailureReason]
+                                                      @"msg": [error localizedDescription]
                                                       }];
                                         } else {
                                             [self
@@ -480,9 +480,7 @@ - (void) sendJSEvent:(NSString *)title
 
 - (void) userCallback:(RCTResponseSenderBlock) callback
                  user:(FIRUser *) user {
-    NSDictionary *userProps = @{
-                                @"user": [self userPropsFromFIRUser:user]
-                                };
+    NSDictionary *userProps = [self userPropsFromFIRUser:user];
     callback(@[[NSNull null], userProps]);
 }