Add support for uploadTask/downloadTask .on()

Author: chrisbianca

lib/modules/storage/reference.js

@@ -71,46 +71,75 @@ export default class StorageRef extends ReferenceBase {
   /**
    * Downloads a reference to the device
    * @param {String} filePath Where to store the file
-   * @param listener
    * @return {Promise}
    */
-  downloadFile(filePath: string, listener: Function = noop): Promise<Object> {
+  downloadFile(filePath: string): Promise<Object> {
     this.log.debug('download(', this.path, ') -> ', filePath);
-    this.storage._addListener(this.path, 'state_changed', listener);
 
-    return promisify('downloadFile', FirestackStorage)(this.path, filePath)
-      .then((res) => {
-        this.storage._removeListener(this.path, 'state_changed', listener);
-        return res;
-      })
-      .catch((err) => {
-        this.log.error('Error downloading ', this.path, ' to ', filePath, '.  Error: ', err);
-        throw err;
-      });
+    let downloadTask = promisify('downloadFile', FirestackStorage)(this.path, filePath);
+    downloadTask.cancel = () => {
+      //TODO
+      throw new Error('.cancel() is not currently supported by react-native-firestack');
+    }
+    downloadTask.on = (event, nextOrObserver, error, complete) => {
+      //TODO: nextOrObserver as an object
+      if (nextOrObserver) this.storage._addListener(this.path, 'state_changed', nextOrObserver);
+      if (error) this.storage._addListener(this.path, 'download_failure', error);
+      if (complete) this.storage._addListener(this.path, 'download_success', complete);
+      return () => {
+        if (nextOrObserver) this.storage._removeListener(this.path, 'state_changed', nextOrObserver);
+        if (error) this.storage._removeListener(this.path, 'download_failure', error);
+        if (complete) this.storage._removeListener(this.path, 'download_success', complete);
+      }
+    }
+    downloadTask.pause = () => {
+      //TODO
+      throw new Error('.pause() is not currently supported by react-native-firestack');
+    }
+    downloadTask.resume = () => {
+      //TODO
+      throw new Error('.resume() is not currently supported by react-native-firestack');
+    }
+
+    return downloadTask;
   }
 
-  //TODO: Change to return UploadTask
   /**
    * Upload a file path
    * @param  {string} filePath The local path of the file
    * @param  {object} metadata An object containing metadata
-   * @param listener
    * @return {Promise}
    */
-  putFile(filePath: Object, metadata: Object = {}, listener: Function = noop): /*UploadTask*/Promise<Object> {
+  putFile(filePath: Object, metadata: Object = {}): Promise<Object> {
     const _filePath = filePath.replace('file://', '');
     this.log.debug('putFile(', _filePath, ') -> ', this.path);
 
-    this.storage._addListener(this.path, 'state_changed', listener);
-
-    return promisify('putFile', FirestackStorage)(this.path, _filePath, metadata)
-      .then((res) => {
-        this.storage._removeListener(this.path, 'state_changed', listener);
-        return res;
-      })
-      .catch((err) => {
-        this.log.error('Error uploading file ', this.path, ' to ', _filePath, '.  Error: ', err);
-        throw err;
-      });
+    //TODO: There's probably a better way of doing this, but I couldn't figure out the best way to extend a promise
+    let uploadTask = promisify('putFile', FirestackStorage)(this.path, _filePath, metadata);
+    uploadTask.cancel = () => {
+      //TODO
+      throw new Error('.cancel() is not currently supported by react-native-firestack');
+    }
+    uploadTask.on = (event, nextOrObserver, error, complete) => {
+      //TODO: nextOrObserver as an object
+      if (nextOrObserver) this.storage._addListener(this.path, 'state_changed', nextOrObserver);
+      if (error) this.storage._addListener(this.path, 'upload_failure', error);
+      if (complete) this.storage._addListener(this.path, 'upload_success', complete);
+      return () => {
+        if (nextOrObserver) this.storage._removeListener(this.path, 'state_changed', nextOrObserver);
+        if (error) this.storage._removeListener(this.path, 'upload_failure', error);
+        if (complete) this.storage._removeListener(this.path, 'upload_success', complete);
+      }
+    }
+    uploadTask.pause = () => {
+      //TODO
+      throw new Error('.pause() is not currently supported by react-native-firestack');
+    }
+    uploadTask.resume = () => {
+      //TODO
+      throw new Error('.resume() is not currently supported by react-native-firestack');
+    }
+
+    return uploadTask;
   }
 }