From 570c0a737c69bf586b2e902fa7196acb78ca8e09 Mon Sep 17 00:00:00 2001
From: James Daniels <james@jamesdaniels.net>
Date: Sat, 12 May 2018 05:41:25 -0700
Subject: [PATCH] feat(firestore): Support Firestore Settings,
 timestampsInSnapshots default to true (#1629)

---
 src/firestore/firestore.ts | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/firestore/firestore.ts b/src/firestore/firestore.ts
index 65216ff5f..83476f107 100644
--- a/src/firestore/firestore.ts
+++ b/src/firestore/firestore.ts
@@ -1,5 +1,5 @@
 import { InjectionToken, NgZone, PLATFORM_ID } from '@angular/core';
-import { FirebaseFirestore, CollectionReference, DocumentReference } from '@firebase/firestore-types';
+import { FirebaseFirestore, CollectionReference, DocumentReference, Settings } from '@firebase/firestore-types';
 
 import { Observable, Subscriber } from 'rxjs';
 import { map, catchError } from 'rxjs/operators';
@@ -18,7 +18,9 @@ import { FirebaseAppConfigToken, FirebaseOptionsToken, FirebaseAppNameToken, _fi
  * The value of this token determines whether or not the firestore will have persistance enabled
  */
 export const EnablePersistenceToken = new InjectionToken<boolean>('angularfire2.enableFirestorePersistence');
+export const FirestoreSettingsToken = new InjectionToken<Settings>('angularfire2.firestore.settings');
 
+export const DefaultFirestoreSettings = {timestampsInSnapshots: true} as Settings;
 
 /**
  * A utility methods for associating a collection reference with
@@ -110,13 +112,16 @@ export class AngularFirestore {
     @Optional() @Inject(FirebaseAppConfigToken) config:FirebaseAppConfig,
     @Optional() @Inject(FirebaseAppNameToken) name:string,
     @Optional() @Inject(EnablePersistenceToken) shouldEnablePersistence: boolean,
+    @Optional() @Inject(FirestoreSettingsToken) settings: Settings,
     @Inject(PLATFORM_ID) platformId: Object,
     zone: NgZone
   ) {
     this.scheduler = new FirebaseZoneScheduler(zone, platformId);
     this.firestore = zone.runOutsideAngular(() => {
-      const app = _firebaseAppFactory(options, name, config);
-      return app.firestore();
+      const app = _firebaseAppFactory(config, name);
+      const firestore = app.firestore();
+      firestore.settings(settings || DefaultFirestoreSettings);
+      return firestore;
     });
 
     this.persistenceEnabled$ = zone.runOutsideAngular(() =>