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

* 'master' of github.com:fullstackreact/react-native-firestack:
  Fix donwloadUrl to use storageUrl from .plist.
  Use storage url from .plist file if not setStorageUrl() hasn't been called.
  Fixed error calling length of undefined
  forEach and map method on the DataSnapshot does not retain key
  removing trailing comma
  Filter out undefined filters
  Parity of response format between ios and android. Added authenticated flag to response from getCurrentUser

Author: auser

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

@@ -530,7 +530,7 @@ public void onComplete(@NonNull Task<GetTokenResult> task) {
                 }
 
                 msgMap.putMap("user", userMap);
-
+                msgMap.putBoolean("authenticated", true);
                 callback.invoke(null, msgMap);
             }
         }).addOnFailureListener(new OnFailureListener() {

ios/Firestack/FirestackStorage.m

@@ -25,7 +25,12 @@ - (dispatch_queue_t)methodQueue
                   path:(NSString *) path
     callback:(RCTResponseSenderBlock) callback)
 {
-    FIRStorageReference *storageRef = [[FIRStorage storage] referenceForURL:storageUrl];
+    FIRStorageReference *storageRef;
+    if (storageUrl == nil ) {
+        storageRef = [[FIRStorage storage] reference];
+    } else {
+        storageRef = [[FIRStorage storage] referenceForURL:storageUrl];
+    }
     FIRStorageReference *fileRef = [storageRef child:path];
     [fileRef downloadURLWithCompletion:^(NSURL * _Nullable URL, NSError * _Nullable error) {
         if (error != nil) {
@@ -52,14 +57,13 @@ - (dispatch_queue_t)methodQueue
                   metadata:(NSDictionary *)metadata
                   callback:(RCTResponseSenderBlock) callback)
 {
+    FIRStorageReference *storageRef;
     if (urlStr == nil) {
-        NSError *err = [[NSError alloc] init];
-        [err setValue:@"Storage configuration error" forKey:@"name"];
-        [err setValue:@"Call setStorageUrl() first" forKey:@"description"];
-        return callback(@[err]);
+        storageRef = [[FIRStorage storage] reference];
+    } else {
+        storageRef = [[FIRStorage storage] referenceForURL:urlStr];
     }
 
-    FIRStorageReference *storageRef = [[FIRStorage storage] referenceForURL:urlStr];
     FIRStorageReference *uploadRef = [storageRef child:name];
     FIRStorageMetadata *firmetadata = [[FIRStorageMetadata alloc] initWithDictionary:metadata];
 

lib/modules/database.js

@@ -35,7 +35,7 @@ class DataSnapshot {
 
   forEach(fn) {
     (this.childKeys || [])
-      .forEach(key => fn(this.value[key]))
+      .forEach(key => fn({key: key, value: this.value[key]}))
   }
 
   map(fn) {
@@ -96,7 +96,7 @@ class DatabaseQuery {
   }
 
   setFilter(name, ...args) {
-    this.filters[name] = args;
+    this.filters[name] = args.filter(n => n != undefined);
     return this.ref;
   }
 
@@ -111,9 +111,10 @@ class DatabaseQuery {
     }
     Object.keys(this.filters)
       .forEach(key => {
-        const filter = this.filters[key];
+        let filter = this.filters[key];
         if (filter) {
-          const filterArgs = ([key].concat(filter)).join(argsSeparator)
+          const cleanFilters = filter.filter((f) => typeof f !== "undefined");
+          const filterArgs = ([key].concat(cleanFilters)).join(argsSeparator);
           modifiers.push(filterArgs);
         }
       })
@@ -232,7 +233,7 @@ class DatabaseRef extends ReferenceBase {
     const path = this.dbPath();
     return this.db.off(path, evt, origCB)
       .then(({callback, subscriptions}) => {
-        if (dbSubscriptions[path] && dbSubscriptions[path][evt].length > 0) {
+        if (dbSubscriptions[path] && dbSubscriptions[path][evt] && dbSubscriptions[path][evt].length > 0) {
           return subscriptions;
         }