@react-native-firebase/storage 15.6.0 → 15.7.1

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [15.7.1](https://github.com/invertase/react-native-firebase/compare/v15.7.0...v15.7.1) (2022-10-19)
+
+**Note:** Version bump only for package @react-native-firebase/storage
+
+# [15.7.0](https://github.com/invertase/react-native-firebase/compare/v15.6.0...v15.7.0) (2022-10-01)
+
+**Note:** Version bump only for package @react-native-firebase/storage
+
 # [15.6.0](https://github.com/invertase/react-native-firebase/compare/v15.5.0...v15.6.0) (2022-09-17)
 
 **Note:** Version bump only for package @react-native-firebase/storage

package/RNFBStorage.podspec

@@ -8,6 +8,8 @@ firebase_sdk_version = appPackage['sdkVersions']['ios']['firebase']
 if coreVersionDetected != coreVersionRequired
   Pod::UI.warn "NPM package '#{package['name']}' depends on '#{appPackage['name']}' v#{coreVersionRequired} but found v#{coreVersionDetected}, this might cause build issues or runtime crashes."
 end
+firebase_ios_target = appPackage['sdkVersions']['ios']['iosTarget']
+firebase_macos_target = appPackage['sdkVersions']['ios']['macosTarget']
 
 Pod::Spec.new do |s|
   s.name                = "RNFBStorage"
@@ -21,7 +23,8 @@ Pod::Spec.new do |s|
   s.authors             = "Invertase Limited"
   s.source              = { :git => "https://github.com/invertase/react-native-firebase.git", :tag => "v#{s.version}" }
   s.social_media_url    = 'http://twitter.com/invertaseio'
-  s.ios.deployment_target = "10.0"
+  s.ios.deployment_target = firebase_ios_target
+  s.macos.deployment_target = firebase_macos_target
   s.source_files        = 'ios/**/*.{h,m}'
 
   # React Native dependencies

package/__tests__/storage.test.ts

@@ -1,3 +1,5 @@
+import { describe, expect, it } from '@jest/globals';
+
 import storage, { firebase } from '../lib';
 
 describe('Storage', function () {

package/ios/RNFBStorage/RNFBStorageCommon.h

@@ -57,7 +57,8 @@
 + (NSString *)getTaskStatus:(FIRStorageTaskStatus)status;
 
 + (FIRStorageMetadata *)buildMetadataFromMap:(NSDictionary *)metadata
-                            existingMetadata:(FIRStorageMetadata *)existingMetadata;
+                            existingMetadata:(FIRStorageMetadata *)existingMetadata
+                                        path:(NSString *)path;
 
 + (NSArray *)getErrorCodeMessage:(NSError *)error;
 

package/ios/RNFBStorage/RNFBStorageCommon.m

@@ -393,11 +393,18 @@
 }
 
 + (FIRStorageMetadata *)buildMetadataFromMap:(NSDictionary *)metadata
-                            existingMetadata:(nullable FIRStorageMetadata *)existingMetadata {
+                            existingMetadata:(nullable FIRStorageMetadata *)existingMetadata
+                                        path:(NSString *)path {
   // If an existing metadata was passed in, modify it with our map, otherwise init a fresh copy
   FIRStorageMetadata *storageMetadata = existingMetadata;
   if (storageMetadata == nil) {
-    storageMetadata = [[FIRStorageMetadata alloc] init];
+    // NOTE: Firebase iOS SDK 10 requires a "path" property on `FIRStorageMetadata`. We do this by
+    // "initWithDictionary()" which uses "name" property as "path" under the hood.
+    // See
+    // https://github.com/firebase/firebase-ios-sdk/blob/970b4c45098319e40e6e5157d340d16cb73a2b88/FirebaseStorage/Sources/StorageMetadata.swift#L156-L178
+    NSMutableDictionary *metadata = [[NSMutableDictionary alloc] init];
+    metadata[@"name"] = path;
+    storageMetadata = [[FIRStorageMetadata alloc] initWithDictionary:metadata];
   }
 
   if (metadata[@"cacheControl"] == [NSNull null]) {

package/ios/RNFBStorage/RNFBStorageModule.m

@@ -35,6 +35,7 @@ static NSMutableDictionary *PENDING_TASKS;
 // The iOS SDK has a short memory on settings, store these globally and set them in each time
 static NSString *emulatorHost = nil;
 static NSInteger emulatorPort = 0;
+static bool useEmulatorCalled = false;
 static NSTimeInterval maxDownloadRetryTime = 600;
 static NSTimeInterval maxUploadRetryTime = 600;
 static NSTimeInterval maxOperationRetryTime = 120;
@@ -150,7 +151,9 @@ RCT_EXPORT_METHOD(updateMetadata
       [self promiseRejectStorageException:reject error:error];
     } else {
       FIRStorageMetadata *storageMetadata =
-          [RNFBStorageCommon buildMetadataFromMap:metadata existingMetadata:fetchedMetadata];
+          [RNFBStorageCommon buildMetadataFromMap:metadata
+                                 existingMetadata:fetchedMetadata
+                                             path:[storageReference fullPath]];
 
       [storageReference updateMetadata:storageMetadata
                             completion:^(FIRStorageMetadata *_Nullable updatedMetadata,
@@ -400,9 +403,11 @@ RCT_EXPORT_METHOD(putFile
                   : (nonnull NSNumber *)taskId
                   : (RCTPromiseResolveBlock)resolve
                   : (RCTPromiseRejectBlock)reject) {
-  FIRStorageMetadata *storageMetadata = [RNFBStorageCommon buildMetadataFromMap:metadata
-                                                               existingMetadata:nil];
   FIRStorageReference *storageReference = [self getReferenceFromUrl:url app:firebaseApp];
+  FIRStorageMetadata *storageMetadata =
+      [RNFBStorageCommon buildMetadataFromMap:metadata
+                             existingMetadata:nil
+                                         path:[storageReference fullPath]];
 
   [RNFBStorageCommon
       NSURLForLocalFilePath:localFilePath
@@ -472,9 +477,11 @@ RCT_EXPORT_METHOD(putString
                   : (nonnull NSNumber *)taskId
                   : (RCTPromiseResolveBlock)resolve
                   : (RCTPromiseRejectBlock)reject) {
-  FIRStorageMetadata *storageMetadata = [RNFBStorageCommon buildMetadataFromMap:metadata
-                                                               existingMetadata:nil];
   FIRStorageReference *storageReference = [self getReferenceFromUrl:url app:firebaseApp];
+  FIRStorageMetadata *storageMetadata =
+      [RNFBStorageCommon buildMetadataFromMap:metadata
+                             existingMetadata:nil
+                                         path:[storageReference fullPath]];
 
   __block FIRStorageUploadTask *uploadTask;
   RCTUnsafeExecuteOnMainQueueSync(^{
@@ -499,7 +506,12 @@ RCT_EXPORT_METHOD(useEmulator
                   : (NSInteger)port) {
   emulatorHost = host;
   emulatorPort = port;
+  if (useEmulatorCalled == true) {
+    return;
+  }
+
   [[FIRStorage storageForApp:firebaseApp] useEmulatorWithHost:host port:port];
+  useEmulatorCalled = true;
 }
 
 /**
@@ -657,9 +669,10 @@ RCT_EXPORT_METHOD(setTaskStatus
   storage = [FIRStorage storageForApp:firebaseApp URL:bucket];
 
   NSLog(@"Setting emulator - host %@ port %ld", emulatorHost, (long)emulatorPort);
-  if (![emulatorHost isEqual:[NSNull null]] && emulatorHost != nil) {
+  if (![emulatorHost isEqual:[NSNull null]] && emulatorHost != nil && useEmulatorCalled == false) {
     @try {
       [storage useEmulatorWithHost:emulatorHost port:emulatorPort];
+      useEmulatorCalled = true;
     } @catch (NSException *e) {
       NSLog(@"WARNING: Unable to set the Firebase Storage emulator settings. These must be set "
             @"before any usages of Firebase Storage. If you see this log after a hot "

package/lib/version.js

@@ -1,2 +1,2 @@
 // Generated by genversion.
-module.exports = '15.6.0';
+module.exports = '15.7.1';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/storage",
-  "version": "15.6.0",
+  "version": "15.7.1",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "React Native Firebase - React Native Firebase provides native integration with Cloud Storage, providing support to upload and download files directly from your device and from your Firebase Cloud Storage bucket.",
   "main": "lib/index.js",
@@ -29,10 +29,10 @@
     "download"
   ],
   "peerDependencies": {
-    "@react-native-firebase/app": "15.6.0"
+    "@react-native-firebase/app": "15.7.1"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "09edad10f28d4d2e0a471aa075c6f004826e1331"
+  "gitHead": "7845819f67e955d75b5756d30c2f5b55a68c9062"
 }