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

* 'master' of github.com:fullstackreact/react-native-firestack: Parity of response format Parity of response format getToken(true) will try to fetch token from server and fail if offline. Analytics parameter variable type fix for quantity, price and value. fix missing downloadUrl property on ios fix missing downloadUrl property on ios

Author: auser

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

@@ -102,16 +102,16 @@ private Bundle makeEventBundle(final String name, final Map<String, Object> map)
  bundle.putString(FirebaseAnalytics.Param.ITEM_NAME, val);
  }
  if (map.containsKey("quantity")) {
- long val = (long) map.get("quantity");
- bundle.putLong(FirebaseAnalytics.Param.QUANTITY, val);
+ double val = (double) map.get("quantity");
+ bundle.putDouble(FirebaseAnalytics.Param.QUANTITY, val);
  }
  if (map.containsKey("price")) {
- long val = (long) map.get("price");
- bundle.putLong(FirebaseAnalytics.Param.PRICE, val);
+ double val = (double) map.get("price");
+ bundle.putDouble(FirebaseAnalytics.Param.PRICE, val);
  }
  if (map.containsKey("value")) {
- long val = (long) map.get("value");
- bundle.putLong(FirebaseAnalytics.Param.VALUE, val);
+ double val = (double) map.get("value");
+ bundle.putDouble(FirebaseAnalytics.Param.VALUE, val);
  }
  if (map.containsKey("currency")) {
  String val = (String) map.get("currency");
@@ -171,7 +171,7 @@ private Bundle makeEventBundle(final String name, final Map<String, Object> map)
  }
  if (map.containsKey("shipping")) {
  double val = (double) map.get("shipping");
- bundle.putDouble(FirebaseAnalytics.Param.NUMBER_OF_PASSENGERS, val);
+ bundle.putDouble(FirebaseAnalytics.Param.SHIPPING, val);
  }
  if (map.containsKey("group_id")) {
  String val = (String) map.get("group_id");

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();

ios/Firestack.xcodeproj/project.pbxproj

@@ -203,6 +203,7 @@
 MTL_ENABLE_DEBUG_INFO = YES;
 ONLY_ACTIVE_ARCH = YES;
 SDKROOT = iphoneos;
+USER_HEADER_SEARCH_PATHS = "";
 };
 name = Debug;
 };
@@ -237,6 +238,7 @@
 IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 MTL_ENABLE_DEBUG_INFO = NO;
 SDKROOT = iphoneos;
+USER_HEADER_SEARCH_PATHS = "";
 VALIDATE_PRODUCT = YES;
 };
 name = Release;

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]);

ios/Firestack/FirestackStorage.m

@@ -135,6 +135,7 @@ - (void) addUploadObservers:(FIRStorageUploadTask *) uploadTask
  @"fullPath": ref.fullPath,
  @"bucket": ref.bucket,
  @"name": ref.name,
+ @"downloadUrl": snapshot.metadata.downloadURLs[0].absoluteString,
  @"metadata": [snapshot.metadata dictionaryRepresentation]
  };