Simplify storage modules to use the bucket specified when initialising Firebase

Author: chrisbianca

android/src/main/java/io/fullstack/firestack/storage/FirestackStorage.java

@@ -85,11 +85,9 @@ public boolean isExternalStorageWritable() {
   }
 
   @ReactMethod
-  public void downloadFile(final String urlStr,
-                           final String fbPath,
+  public void downloadFile(final String remotePath,
                            final String localFile,
                            final Callback callback) {
-    Log.d(TAG, "downloadFile: " + urlStr + ", " + localFile);
     if (!isExternalStorageWritable()) {
       Log.w(TAG, "downloadFile failed: external storage not writable");
       WritableMap error = Arguments.createMap();
@@ -99,13 +97,9 @@ public void downloadFile(final String urlStr,
       callback.invoke(error);
       return;
     }
-    FirebaseStorage storage = FirebaseStorage.getInstance();
-    String storageBucket = storage.getApp().getOptions().getStorageBucket();
-    String storageUrl = "gs://" + storageBucket;
-    Log.d(TAG, "Storage url " + storageUrl + fbPath);
+    Log.d(TAG, "downloadFile from remote path: " + remotePath);
 
-    StorageReference storageRef = storage.getReferenceFromUrl(storageUrl);
-    StorageReference fileRef = storageRef.child(fbPath);
+    StorageReference fileRef = FirebaseStorage.getInstance().getReference(remotePath);
 
     fileRef.getStream(new StreamDownloadTask.StreamProcessor() {
       @Override
@@ -182,15 +176,10 @@ public void onFailure(@NonNull Exception exception) {
   }
 
   @ReactMethod
-  public void downloadUrl(final String javascriptStorageBucket,
-                          final String path,
+  public void downloadUrl(final String remotePath,
                           final Callback callback) {
-    FirebaseStorage storage = FirebaseStorage.getInstance();
-    String storageBucket = storage.getApp().getOptions().getStorageBucket();
-    String storageUrl = "gs://" + storageBucket;
-    Log.d(TAG, "Storage url " + storageUrl + path);
-    final StorageReference storageRef = storage.getReferenceFromUrl(storageUrl);
-    final StorageReference fileRef = storageRef.child(path);
+    Log.d(TAG, "Download url for remote path: " + remotePath);
+    final StorageReference fileRef = FirebaseStorage.getInstance().getReference(remotePath);
 
     Task<Uri> downloadTask = fileRef.getDownloadUrl();
     downloadTask
@@ -200,7 +189,7 @@ public void onSuccess(Uri uri) {
             final WritableMap res = Arguments.createMap();
 
             res.putString("status", "success");
-            res.putString("bucket", storageRef.getBucket());
+            res.putString("bucket", FirebaseStorage.getInstance().getApp().getOptions().getStorageBucket());
             res.putString("fullPath", uri.toString());
             res.putString("path", uri.getPath());
             res.putString("url", uri.toString());
@@ -256,12 +245,10 @@ private WritableMap getMetadataAsMap(StorageMetadata storageMetadata) {
 
   // STORAGE
   @ReactMethod
-  public void uploadFile(final String urlStr, final String name, final String filepath, final ReadableMap metadata, final Callback callback) {
-    FirebaseStorage storage = FirebaseStorage.getInstance();
-    StorageReference storageRef = storage.getReferenceFromUrl(urlStr);
-    StorageReference fileRef = storageRef.child(name);
+  public void uploadFile(final String remotePath, final String filepath, final ReadableMap metadata, final Callback callback) {
+    StorageReference fileRef = FirebaseStorage.getInstance().getReference(remotePath);
 
-    Log.i(TAG, "From file: " + filepath + " to " + urlStr + " with name " + name);
+    Log.i(TAG, "Upload file: " + filepath + " to " + remotePath);
 
     try {
       Uri file;

ios/Firestack/FirestackStorage.m

@@ -21,17 +21,15 @@ - (dispatch_queue_t)methodQueue
   return dispatch_queue_create("io.fullstack.firestack.storage", DISPATCH_QUEUE_SERIAL);
 }
 
-RCT_EXPORT_METHOD(downloadUrl: (NSString *) storageUrl
-                  path:(NSString *) path
+RCT_EXPORT_METHOD(downloadUrl: (NSString *) remotePath
     callback:(RCTResponseSenderBlock) callback)
 {
-    FIRStorageReference *storageRef = [[FIRStorage storage] referenceForURL:storageUrl];
-    FIRStorageReference *fileRef = [storageRef child:path];
+    FIRStorageReference *fileRef = [[FIRStorage storage] referenceWithPath:remotePath];
     [fileRef downloadURLWithCompletion:^(NSURL * _Nullable URL, NSError * _Nullable error) {
         if (error != nil) {
             NSDictionary *evt = @{
                                   @"status": @"error",
-                                  @"path": path,
+                                  @"path": remotePath,
                                   @"msg": [error debugDescription]
                                   };
             callback(@[evt]);
@@ -46,21 +44,12 @@ - (dispatch_queue_t)methodQueue
     }];
 }
 
-RCT_EXPORT_METHOD(uploadFile: (NSString *) urlStr
-                  name: (NSString *) name
+RCT_EXPORT_METHOD(uploadFile: (NSString *) remotePath
                   path:(NSString *)path
                   metadata:(NSDictionary *)metadata
                   callback:(RCTResponseSenderBlock) callback)
 {
-    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]);
-    }
-
-    FIRStorageReference *storageRef = [[FIRStorage storage] referenceForURL:urlStr];
-    FIRStorageReference *uploadRef = [storageRef child:name];
+    FIRStorageReference *uploadRef = [[FIRStorage storage] referenceWithPath:remotePath];
     FIRStorageMetadata *firmetadata = [[FIRStorageMetadata alloc] initWithDictionary:metadata];
 
     if ([path hasPrefix:@"assets-library://"]) {
@@ -164,21 +153,11 @@ - (void) addUploadObservers:(FIRStorageUploadTask *) uploadTask
         }}];
 }
 
-RCT_EXPORT_METHOD(downloadFile: (NSString *) urlStr
-                  path:(NSString *) path
+RCT_EXPORT_METHOD(downloadFile: (NSString *) remotePath
                   localFile:(NSString *) file
                   callback:(RCTResponseSenderBlock) callback)
 {
-    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]);
-    }
-
-    FIRStorageReference *storageRef = [[FIRStorage storage] referenceForURL:urlStr];
-    FIRStorageReference *fileRef = [storageRef child:path];
-
+    FIRStorageReference *fileRef = [[FIRStorage storage] referenceWithPath:remotePath];
     NSURL *localFile = [NSURL fileURLWithPath:file];
 
     FIRStorageDownloadTask *downloadTask = [fileRef writeToFile:localFile];

lib/modules/storage.js

@@ -17,7 +17,7 @@ class StorageRef extends ReferenceBase {
   downloadUrl(): Promise<Object> {
     const path = this.pathToString();
     this.log.debug('downloadUrl(', path, ')');
-    return promisify('downloadUrl', FirestackStorage)(this.storage.storageUrl, path)
+    return promisify('downloadUrl', FirestackStorage)(path)
       .catch(err => {
         this.log.error('Error downloading URL for ', path, '.  Error: ', err);
         throw err;
@@ -39,7 +39,7 @@ class StorageRef extends ReferenceBase {
       this.storage._addListener('download_resumed', listener),
     ];
 
-    return promisify('downloadFile', FirestackStorage)(this.storage.storageUrl, path, downloadPath)
+    return promisify('downloadFile', FirestackStorage)(path, downloadPath)
       .then((res) => {
         this.log.debug('res --->', res);
         listeners.forEach(listener => listener.remove());
@@ -58,11 +58,6 @@ type StorageOptionsType = {
 export default class Storage extends Base {
   constructor(firestack: Object, options:StorageOptionsType={}) {
     super(firestack, options);
-
-    if (this.options.storageBucket) {
-      this.setStorageUrl(this.options.storageBucket);
-    }
-
     this.refs = {};
   }
 
@@ -92,7 +87,7 @@ export default class Storage extends Base {
       this._addListener('upload_progress', listener),
     ];
 
-    return promisify('uploadFile', FirestackStorage)(this.storageUrl, name, _filePath, metadata)
+    return promisify('uploadFile', FirestackStorage)(name, _filePath, metadata)
       .then((res) => {
         listeners.forEach(listener => listener.remove());
         return res;
@@ -112,11 +107,6 @@ export default class Storage extends Base {
     return listener;
   }
 
-  setStorageUrl(url: string): void {
-    // return promisify('setStorageUrl', FirestackStorage)(url);
-    this.storageUrl = `gs://${url}`;
-  }
-
   _pathKey(...path: Array<string>): string {
     return path.join('-');
   }