@react-native-firebase/storage 20.2.0 → 20.3.0

package/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [20.3.0](https://github.com/invertase/react-native-firebase/compare/v20.2.1...v20.3.0) (2024-07-19)
+
+**Note:** Version bump only for package @react-native-firebase/storage
+
+## [20.2.1](https://github.com/invertase/react-native-firebase/compare/v20.2.0...v20.2.1) (2024-07-17)
+
+### Bug Fixes
+
+- **storage:** ensure emulator is used for different storage buckets ([#7892](https://github.com/invertase/react-native-firebase/issues/7892)) ([3fa3f11](https://github.com/invertase/react-native-firebase/commit/3fa3f110b357ef0dbe2cc0fc12e982edc913b588))
+
 ## [20.2.0](https://github.com/invertase/react-native-firebase/compare/v20.1.0...v20.2.0) (2024-07-15)
 
 ### Features

package/android/src/main/java/io/invertase/firebase/storage/ReactNativeFirebaseStorageModule.java

@@ -281,12 +281,15 @@ public class ReactNativeFirebaseStorageModule extends ReactNativeFirebaseModule
    * @link https://firebase.google.com/docs/reference/js/firebase.storage.Storage#useEmulator
    */
   @ReactMethod
-  public void useEmulator(String appName, String host, int port, Promise promise) {
+  public void useEmulator(String appName, String host, int port, String bucketUrl, Promise promise) {
     FirebaseApp firebaseApp = FirebaseApp.getInstance(appName);
-    FirebaseStorage firebaseStorage = FirebaseStorage.getInstance(firebaseApp);
-    if (emulatorConfigs.get(appName) == null) {
+
+    FirebaseStorage firebaseStorage = FirebaseStorage.getInstance(firebaseApp, bucketUrl);
+    String emulatorKey = appName + ":" + bucketUrl;
+
+    if (emulatorConfigs.get(emulatorKey) == null) {
       firebaseStorage.useEmulator(host, port);
-      emulatorConfigs.put(appName, "true");
+      emulatorConfigs.put(emulatorKey, "true");
     }
     promise.resolve(null);
   }

package/ios/RNFBStorage/RNFBStorageModule.m

@@ -511,12 +511,15 @@ RCT_EXPORT_METHOD(putString
 RCT_EXPORT_METHOD(useEmulator
                   : (FIRApp *)firebaseApp
                   : (nonnull NSString *)host
-                  : (NSInteger)port) {
+                  : (NSInteger)port
+                  : (NSString *)bucketUrl) {
   emulatorHost = host;
   emulatorPort = port;
-  if (!emulatorConfigs[firebaseApp.name]) {
-    [[FIRStorage storageForApp:firebaseApp] useEmulatorWithHost:host port:port];
-    emulatorConfigs[firebaseApp.name] = @YES;
+  NSString *key = [self createEmulatorKey:bucketUrl appName:firebaseApp.name];
+
+  if (!emulatorConfigs[key]) {
+    [[FIRStorage storageForApp:firebaseApp URL:bucketUrl] useEmulatorWithHost:host port:port];
+    emulatorConfigs[key] = @YES;
   }
 }
 
@@ -557,6 +560,10 @@ RCT_EXPORT_METHOD(setTaskStatus
 #pragma mark -
 #pragma mark Firebase Storage Internals
 
+- (NSString *)createEmulatorKey:(NSString *)bucketUrl appName:(NSString *)appName {
+  return [NSString stringWithFormat:@"%@-%@", appName, bucketUrl];
+}
+
 - (void)addUploadTaskObservers:(FIRStorageUploadTask *)uploadTask
                 appDisplayName:(NSString *)appDisplayName
                         taskId:(NSNumber *)taskId
@@ -675,11 +682,11 @@ 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 &&
-      !emulatorConfigs[firebaseApp.name]) {
+  NSString *key = [self createEmulatorKey:bucket appName:firebaseApp.name];
+  if (![emulatorHost isEqual:[NSNull null]] && emulatorHost != nil && !emulatorConfigs[key]) {
     @try {
       [storage useEmulatorWithHost:emulatorHost port:emulatorPort];
-      emulatorConfigs[firebaseApp.name] = @YES;
+      emulatorConfigs[key] = @YES;
     } @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/index.js

@@ -203,7 +203,7 @@ class FirebaseStorageModule extends FirebaseModule {
     }
     this.emulatorHost = host;
     this.emulatorPort = port;
-    this.native.useEmulator(_host, port);
+    this.native.useEmulator(_host, port, this._customUrlOrRegion);
     return [_host, port]; // undocumented return, just used to unit test android host remapping
   }
 }

package/lib/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-firebase/storage",
-  "version": "20.2.0",
+  "version": "20.3.0",
   "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": "20.2.0"
+    "@react-native-firebase/app": "20.3.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "82c50138d07e673213cd8dee5ce9a2f9b5656649"
+  "gitHead": "a916b37b022cf40588fa0fd915b7ab901e2458d0"
 }