Merge pull request #162 from chaitanya0bhagvan/master

Fix android exception

Author: auser

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

@@ -518,7 +518,7 @@ public void userCallback(FirebaseUser passedUser, final Callback callback) {
           this.user = passedUser;
         }
 
-        this.user.getToken(true).addOnCompleteListener(new OnCompleteListener<GetTokenResult>() {
+        this.user.getToken(false).addOnCompleteListener(new OnCompleteListener<GetTokenResult>() {
             @Override
             public void onComplete(@NonNull Task<GetTokenResult> task) {
                 WritableMap msgMap = Arguments.createMap();

Diff for: ios/Firestack/FirestackAuth.m

@@ -29,7 +29,7 @@ @implementation FirestackAuth
                                    };
 
 
-             [self sendJSEvent:AUTH_CHANGED_EVENT 
+             [self sendJSEvent:AUTH_CHANGED_EVENT
                   props: evt];
 
              callBack(@[evt]);
@@ -43,7 +43,7 @@ @implementation FirestackAuth
                                      @"eventName": AUTH_ANONYMOUS_ERROR_EVENT,
                                      @"errorMessage": ex.reason
                                      };
-        
+
         [self sendJSEvent:AUTH_ERROR_EVENT
                     props:eventError];
         NSLog(@"An exception occurred: %@", ex);
@@ -186,12 +186,16 @@ @implementation FirestackAuth
     FIRUser *user = [FIRAuth auth].currentUser;
 
     if (user != nil) {
-        NSMutableDictionary *userProps = [self userPropsFromFIRUser:user];
-        [userProps setValue: @((BOOL)true) forKey: @"authenticated"];
-        callback(@[[NSNull null], userProps]);
+        NSDictionary *userProps = [self userPropsFromFIRUser:user];
+        NSDictionary *responseProps = @{
+                                            @"authenticated": @((BOOL) true),
+                                            @"user": userProps
+                                            };
+        callback(@[[NSNull null], responseProps]);
     } else {
         // No user is signed in.
         NSDictionary *err = @{
+                              @"authenticated": @((BOOL) false),
                               @"user": @"No user logged in"
                               };
         callback(@[err]);