feat(storage): download url observables

Author: davideast

src/storage/observable/fromRef.ts

@@ -0,0 +1,11 @@
+import { storage } from 'firebase/app';
+import { Observable } from 'rxjs/Observable';
+import { from } from 'rxjs/observable/from';
+
+export function getDownloadURL(ref: storage.Reference) { 
+  return from(ref.getDownloadURL()); 
+}
+
+export function getMetadata(ref: storage.Reference) { 
+  return from(ref.getMetadata()); 
+}

src/storage/public_api.ts

@@ -2,4 +2,5 @@ export * from './ref';
 export * from './storage';
 export * from './task';
 export * from './observable/fromTask';
+export * from './observable/fromRef';
 export * from './storage.module';

src/storage/put.ts

@@ -0,0 +1,15 @@
+import { storage } from 'firebase/app';
+import { createUploadTask } from './task';
+import { Observable } from 'rxjs/Observable';
+
+/**
+ * A higher order function (function that makes a function) that 
+ * starts an upload and creates an AngularFire wrapped upload task.
+ * @param ref 
+ */
+export function createPut(ref: storage.Reference) {
+  return function put(data: any, metadata?: storage.UploadMetadata) {
+    const task = ref.put(data, metadata);
+    return createUploadTask(task);
+  }
+}

src/storage/ref.ts

@@ -1,11 +1,20 @@
 import { storage } from 'firebase/app';
-import { AngularFireUploadTask } from './task';
+import { createPut } from './put';
+import { Observable } from 'rxjs/Observable';
+import { from } from 'rxjs/observable/from';
+import { getDownloadURL, getMetadata } from './observable/fromRef';
 
-export class AngularFireStorageRef {
-  constructor(public ref: storage.Reference) { }
-  put(data: any, metadata?: storage.UploadMetadata) {
-    const task = this.ref.put(data, metadata);
-    return new AngularFireUploadTask(task);
+/**
+ * Create an AngularFire wrapped Storage Reference. This object
+ * creates observable methods from promise based methods.
+ * @param ref 
+ */
+export function createStorageRef(ref: storage.Reference) {
+  return {
+    getDownloadURL() { return getDownloadURL(ref); },
+    getMetadata() { return getMetadata(ref); },
+    put(data: any, metadata?: storage.UploadMetadata) {
+      return createPut(ref)(data, metadata);
+    }
   }
 }
-

src/storage/storage.ts

@@ -1,10 +1,18 @@
 import { Injectable } from '@angular/core';
 import { storage } from 'firebase/app';
-import 'firebase/storage';
 import { FirebaseApp } from 'angularfire2';
-import { AngularFireStorageRef } from './ref';
-import { AngularFireUploadTask } from './task';
+import { createStorageRef } from './ref';
+import { createUploadTask } from './task';
+import { Observable } from 'rxjs/Observable';
 
+/**
+ * AngularFireStorage Service
+ * 
+ * This service is the main entry point for this feature module. It provides
+ * an API for uploading and downloading binary files from Cloud Storage for
+ * Firebase.
+ * 
+ */
 @Injectable()
 export class AngularFireStorage {
   storage: storage.Storage;
@@ -14,12 +22,12 @@ export class AngularFireStorage {
     }
 
     ref(path: string) {
-      return new AngularFireStorageRef(this.storage.ref(path));
+      return createStorageRef(this.storage.ref(path));
     }
 
-    upload(pathOrRef: string, data: any, metadata?: storage.UploadMetadata) {
-      const storageRef = this.storage.ref(pathOrRef);
-      const ref = new AngularFireStorageRef(storageRef);
+    upload(path: string, data: any, metadata?: storage.UploadMetadata) {
+      const storageRef = this.storage.ref(path);
+      const ref = createStorageRef(storageRef);
       return ref.put(data, metadata);
     }
 

src/storage/task.ts

@@ -2,18 +2,15 @@ import { storage } from 'firebase/app';
 import { fromTask } from './observable/fromTask';
 import { Observable } from 'rxjs/Observable';
 
-export class AngularFireUploadTask {
-  constructor(public task: storage.UploadTask) {}
-
-  snapshotChanges() { return fromTask(this.task); }
-
-  pause() { return this.task.pause(); }
-
-  cancel() { return this.task.cancel(); }
-
-  resume() { return this.task.resume(); }
-
-  then() { return this.task.then(); }
-
-  catch(onRejected: (a: Error) => any) { return this.task.catch(onRejected); } 
+export function createUploadTask(task: storage.UploadTask) {
+  return {
+    snapshotChanges() { return fromTask(task); },    
+    pause() { return task.pause(); },    
+    cancel() { return task.cancel(); },    
+    resume() { return task.resume(); },    
+    then() { return task.then(); },    
+    catch(onRejected: (a: Error) => any) { 
+      return task.catch(onRejected);
+    } 
+  };
 }