Merge branch 'master' into ng12

Author: jamesdaniels

src/auth/auth.spec.ts

@@ -2,7 +2,7 @@ import firebase from 'firebase/app';
 import { Observable, Subject } from 'rxjs';
 import { TestBed } from '@angular/core/testing';
 import { AngularFireModule, FIREBASE_APP_NAME, FIREBASE_OPTIONS, FirebaseApp } from '@angular/fire';
-import { AngularFireAuth, AngularFireAuthModule } from '@angular/fire/auth';
+import { AngularFireAuth, AngularFireAuthModule, SETTINGS } from '@angular/fire/auth';
 import { COMMON_CONFIG } from '../test-config';
 import 'firebase/auth';
 import { rando } from '../firestore/utils.spec';
@@ -22,6 +22,9 @@ describe('AngularFireAuth', () => {
       imports: [
         AngularFireModule.initializeApp(COMMON_CONFIG, rando()),
         AngularFireAuthModule
+      ],
+      providers: [
+        { provide: SETTINGS, useValue: { appVerificationDisabledForTesting: true } }
       ]
     });
 
@@ -72,6 +75,11 @@ describe('AngularFireAuth', () => {
     expect(afAuth.app).toBeDefined();
   });
 
+  it('should have disabled app verification for testing', async () => {
+    const app = await afAuth.app;
+    expect(app.auth().settings.appVerificationDisabledForTesting).toBe(true);
+  });
+
   it('should emit auth updates through authState', (done: any) => {
     let count = 0;
 

src/auth/auth.ts

@@ -99,7 +99,9 @@ export class AngularFireAuth {
             auth.useDeviceLanguage();
           }
           if (settings) {
-            auth.settings = settings;
+            for (const [k, v] of Object.entries(settings)) {
+              auth.settings[k] = v;
+            }
           }
           if (persistence) {
             auth.setPersistence(persistence);