fix(afs): workarounds for firebase-js-sdk #605 and #608

Author: jamesdaniels

src/firestore/firestore.spec.ts

@@ -1,4 +1,4 @@
-import { FirebaseApp, FirebaseAppConfig, AngularFireModule, FirebaseAppName } from 'angularfire2';
+  import { FirebaseApp, FirebaseAppConfig, AngularFireModule, FirebaseAppName } from 'angularfire2';
 import { AngularFirestore } from './firestore';
 import { AngularFirestoreModule } from './firestore.module';
 import { AngularFirestoreDocument } from './document/document';
@@ -33,8 +33,9 @@ describe('AngularFirestore', () => {
     })();
   });
 
-  afterEach(async (done) => {
-    await app.delete();
+  afterEach(done => {
+    // can't await here https://github.com/firebase/firebase-js-sdk/issues/605
+    app.delete();
     done();
   });
 

src/firestore/firestore.ts

@@ -118,10 +118,14 @@ export class AngularFirestore {
       return app.firestore();
     });
 
+    // the try/catch here is very very ugly https://github.com/firebase/firebase-js-sdk/issues/608
     this.persistenceEnabled$ = zone.runOutsideAngular(() => {
       return shouldEnablePersistence ?
-        from(this.firestore.enablePersistence().then(() => true, () => false)) :
-        from(new Promise((res, rej) => { res(false); }));
+        (() => {
+          try { return from(this.firestore.enablePersistence().then(() => true, () => false)) }
+          catch(e) { return Observable.of(false ) }
+        })() :
+        Observable.of(false);
     });
   }