Merged master

CHANGELOG.md

@@ -1,5 +1,14 @@
+<a name="6.1.5"></a>
+# [6.1.5](https://github.com/angular/angularfire/compare/6.1.4...6.1.5) (2021-05-17)
+
+Support Angular 12 peer
+
+### Bug Fixes
+
+* **auth:** set the passed settings individually ([#2826](https://github.com/angular/angularfire/issues/2826)) ([984803d](https://github.com/angular/angularfire/commit/984803d))
+
 <a name="6.1.4"></a>
-## [6.1.4](https://github.com/angular/angularfire/compare/6.1.3...6.1.4) (2020-12-03)
+# [6.1.4](https://github.com/angular/angularfire/compare/6.1.3...6.1.4) (2020-12-03)
 
 
 ### Bug Fixes
@@ -10,7 +19,7 @@
 
 
 <a name="6.1.3"></a>
-## [6.1.3](https://github.com/angular/angularfire/compare/6.1.2...6.1.3) (2020-11-30)
+# [6.1.3](https://github.com/angular/angularfire/compare/6.1.2...6.1.3) (2020-11-30)
 
 
 ### Bug Fixes

README.md

@@ -56,7 +56,7 @@ export class MyApp {
 
 ### Angular and Firebase versions
 
-AngularFire doesn't follow Angular's versioning as Firebase also has breaking changes throughout the year. Instead we try to maintain compatability with both Firebase and Angular majors for as long as possible, only breaking when we need to support a new major of one or the other.
+AngularFire doesn't follow Angular's versioning as Firebase also has breaking changes throughout the year. Instead we try to maintain compatibility with both Firebase and Angular majors for as long as possible, only breaking when we need to support a new major of one or the other.
 
 | Angular | Firebase | AngularFire  |
 | --------|----------|--------------|

docs/auth/getting-started.md

@@ -38,6 +38,118 @@ export class AppComponent {
 }
 ```
 
+## Configuration with Dependency Injection
+
+The AngularFireAuth Module provides several DI tokens to further configure your
+authentication process.
+
+### Configure 
+
+Using the `SETTINGS` DI Token (*default: null*), we can set the current Auth
+instance's settings. This is used to edit/read configuration related options
+like app verification mode for phone authentication, which is useful for
+[testing](https://cloud.google.com/identity-platform/docs/test-phone-numbers).
+
+```ts
+import { SETTINGS as AUTH_SETTINGS } from '@angular/fire/auth';
+
+@NgModule({
+  // ... Existing configuration
+  providers: [
+    // ... Existing Providers
+    { provide: AUTH_SETTINGS, useValue: { appVerificationDisabledForTesting: true } },
+  ]
+})
+export class AppModule { }
+```
+
+Read more at [Firebase Auth Settings](https://firebase.google.com/docs/reference/js/firebase.auth.AuthSettings).
+
+### Use Current Browser Language
+
+Using the `USE_DEVICE_LANGUAGE` DI Token (*default: null*), which is a boolean
+that allow you to set the current language to the default device/browser
+preference. This allows to localize emails but be aware that this only applies
+if you use the standard template provided by Firebase. 
+
+```ts
+import { USE_DEVICE_LANGUAGE } from '@angular/fire/auth';
+
+@NgModule({
+  // ... Existing configuration
+  providers: [
+    // ... Existing Providers
+    { provide: USE_DEVICE_LANGUAGE, useValue: true },
+  ]
+})
+export class AppModule { }
+```
+
+If you want to set a different language, you can use `LANGUAGE_CODE` DI Token
+(*default: null*).
+
+More info at the [firebase auth docs](https://firebase.google.com/docs/reference/js/firebase.auth.Auth#languagecode).
+
+```ts
+import { LANGUAGE_CODE } from '@angular/fire/auth';
+
+@NgModule({
+  // ... Existing configuration
+  providers: [
+    // ... Existing Providers
+    { provide: LANGUAGE_CODE, useValue: 'fr' },
+  ]
+})
+export class AppModule { }
+```
+
+### Persistence
+
+Firebase Auth default behavior is to persist a user's session even after the
+user closes the browser. To change the current type of persistence on the
+current Auth instance for the currently saved Auth session and apply this type
+of persistence for future sign-in requests, including sign-in with redirect
+requests, you can use the `PERSISTENCE` DI Token (*default: null*).
+
+The possible types are `'local'`, `'session'` or `'none'`. Read more at 
+[authentication state persistence](https://firebase.google.com/docs/auth/web/auth-state-persistence),
+
+```ts
+import { PERSISTENCE } from '@angular/fire/auth';
+
+@NgModule({
+  // ... Existing configuration
+  providers: [
+    // ... Existing Providers
+    { provide: PERSISTENCE, useValue: 'session' },
+  ]
+})
+export class AppModule { }
+```
+
+### Tenant
+
+If you need to use multi-tenancy, you can set the current Auth instance's tenant
+ID using `TENANT_ID` DI Token (*default: null*).
+
+More tutorials regarding this topic are _coming soon_.
+
+```ts
+import { TENANT_ID } from '@angular/fire/auth';
+
+@NgModule({
+  // ... Existing configuration
+  providers: [
+    // ... Existing Providers
+    { provide: TENANT_ID, useValue: 'tenant-id-app-one' },
+  ]
+})
+export class AppModule { }
+```
+
+- [Multi-Tenancy Authentication](https://cloud.google.com/identity-platform/docs/multi-tenancy-authentication)
+- [Firebase Auth Tenant](https://firebase.google.com/docs/reference/js/firebase.auth.Auth#tenantid)
+
 ## UI Libraries
 
 - Material Design : [ngx-auth-firebaseui](https://github.com/AnthonyNahas/ngx-auth-firebaseui)

package.json

@@ -55,13 +55,13 @@
     "firebase": "9.0.0-beta.8",
     "firebase-admin": "^8.10.0",
     "firebase-functions": "^3.6.0",
-    "firebase-tools": "^8.0.0",
+    "firebase-tools": "^8.0.0 || ^9.0.0",
     "fs-extra": "^8.0.1",
     "fuzzy": "^0.1.3",
     "husky": "^4.2.5",
     "inquirer": "^6.2.2",
     "inquirer-autocomplete-prompt": "^1.0.1",
-    "lodash.isequal": "^4.5.0",
+    "jsonc-parser": "^3.0.0",
     "open": "^7.0.3",
     "rxfire": "6.0.0-canary.92c6c26",
     "rxjs": "~6.6.0",

sample-compat/angular.json

@@ -18,7 +18,6 @@
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.app.json",
-            "aot": true,
             "assets": [
               "src/favicon.ico",
               "src/assets",
@@ -29,7 +28,13 @@
             "styles": [
               "src/styles.css"
             ],
-            "scripts": []
+            "scripts": [],
+            "vendorChunk": true,
+            "extractLicenses": false,
+            "buildOptimizer": false,
+            "sourceMap": true,
+            "optimization": false,
+            "namedChunks": true
           },
           "configurations": {
             "emulated": {
@@ -69,7 +74,8 @@
               "serviceWorker": true,
               "ngswConfigPath": "ngsw-config.json"
             }
-          }
+          },
+          "defaultConfiguration": ""
         },
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
@@ -129,7 +135,9 @@
             "main": "server.ts",
             "tsConfig": "tsconfig.server.json",
             "bundleDependencies": true,
-            "externalDependencies": [ ]
+            "externalDependencies": [ ],
+            "sourceMap": true,
+            "optimization": false
           },
           "configurations": {
             "production": {
@@ -143,7 +151,8 @@
               "sourceMap": false,
               "optimization": true
             }
-          }
+          },
+          "defaultConfiguration": ""
         },
         "serve-ssr": {
           "builder": "@nguniversal/builders:ssr-dev-server",

sample-compat/package.json

@@ -14,25 +14,25 @@
     "dev:ssr": "ng run sample:serve-ssr",
     "bust": "rm -rf node_modules/@angular/fire && yarn cache clean @angular/fire && yarn add ../dist/packages-dist",
     "serve:ssr": "node dist/sample/server/main.js",
-    "build:ssr": "ng build --prod && ng run sample:server:production",
+    "build:ssr": "ng build --configuration production && ng run sample:server:production",
     "prerender": "ng run sample:prerender"
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~12.0.0-rc.0",
-    "@angular/common": "~12.0.0-rc.0",
-    "@angular/compiler": "~12.0.0-rc.0",
-    "@angular/core": "~12.0.0-rc.0",
+    "@angular/animations": "~12.2.2",
+    "@angular/common": "~12.2.2",
+    "@angular/compiler": "~12.2.2",
+    "@angular/core": "~12.2.2",
     "@angular/fire": "../dist/packages-dist",
-    "@angular/forms": "~12.0.0-rc.0",
-    "@angular/platform-browser": "~12.0.0-rc.0",
-    "@angular/platform-browser-dynamic": "~12.0.0-rc.0",
-    "@angular/platform-server": "~12.0.0-rc.0",
-    "@angular/router": "~12.0.0-rc.0",
-    "@angular/service-worker": "~12.0.0-rc.0",
-    "@nguniversal/express-engine": "~12.0.0-next.1",
+    "@angular/forms": "~12.2.2",
+    "@angular/platform-browser": "~12.2.2",
+    "@angular/platform-browser-dynamic": "~12.2.2",
+    "@angular/platform-server": "~12.2.2",
+    "@angular/router": "~12.2.2",
+    "@angular/service-worker": "~12.2.2",
     "core-js": "^3.6.5",
-    "firebase": "^9.0.0-beta.1",
+    "firebase": "^9.0.0-beta.8",
+    "rxfire": "6.0.0-canary.92c6c26",
     "first-input-delay": "^0.1.3",
     "proxy-polyfill": "^0.3.2",
     "rxjs": "~6.6.0",
@@ -41,13 +41,12 @@
     "zone.js": "~0.11.4"
   },
   "devDependencies": {
-    "@angular-devkit/architect": "~0.1200.0-rc.0",
-    "@angular-devkit/build-angular": "~12.0.0-rc.0",
-    "@angular/cli": "~12.0.0-rc.0",
-    "@angular/compiler-cli": "~12.0.0-rc.0",
-    "@angular/language-service": "~12.0.0-rc.0",
+    "@angular-devkit/architect": "~0.1202.2",
+    "@angular-devkit/build-angular": "~12.2.2",
+    "@angular/cli": "~12.2.2",
+    "@angular/compiler-cli": "~12.2.2",
+    "@angular/language-service": "~12.2.2",
     "@firebase/app-types": "^0.6.1",
-    "@nguniversal/builders": "~12.0.0-next.1",
     "@types/jasmine": "~3.5.0",
     "@types/jasminewd2": "~2.0.3",
     "codelyzer": "^6.0.0",
@@ -64,7 +63,7 @@
     "inquirer-autocomplete-prompt": "^1.0.1",
     "jasmine-core": "~3.5.0",
     "jasmine-spec-reporter": "~5.0.0",
-    "karma": "~5.1.1",
+    "karma": "~6.3.4",
     "karma-chrome-launcher": "~3.1.0",
     "karma-coverage-istanbul-reporter": "~3.0.2",
     "karma-jasmine": "~4.0.0",
@@ -74,4 +73,4 @@
     "typescript": "~4.2.3",
     "webpack-bundle-analyzer": "^4.4.1"
   }
-}
+}

sample-compat/server.ts

@@ -1,4 +1,4 @@
-import 'zone.js/dist/zone-node';
+import 'zone.js/node';
 
 import { ngExpressEngine } from '@nguniversal/express-engine';
 import * as express from 'express';
@@ -15,7 +15,7 @@ global['WebSocket'] = require('ws');
 /* tslint:enable:no-string-literal */
 
 // include the protos required to bundle firestore
-import 'dir-loader!./firestore-protos';
+// import 'dir-loader!./firestore-protos';
 
 // The Express app is exported so that it can be used by serverless Functions.
 export function app() {
@@ -36,7 +36,7 @@ export function app() {
   // Serve static files from /browser
   server.get('*.*', express.static(distFolder, {
     maxAge: '1y'
-  }));
+  }) as any);
 
   // All regular routes use the Universal engine
   server.get('*', (req, res) => {

sample-compat/src/app/database/database.component.ts

@@ -25,8 +25,8 @@ export class DatabaseComponent implements OnInit {
       this.testObjectValue$ = EMPTY;
     } else {
       const doc = database.object('test');
-      const key = makeStateKey(doc.query.toString());
-      const existing = state.get<any>(key, undefined);
+      const key = makeStateKey<unknown>(doc.query.toString());
+      const existing = state.get(key, undefined);
       this.testObjectValue$ = doc.valueChanges().pipe(
         trace('database'),
         existing ? startWith(existing) : tap(it => state.set(key, it))

sample-compat/src/app/firestore-offline/firestore-offline.component.ts

@@ -22,8 +22,8 @@ export class FirestoreOfflineComponent implements OnInit {
 
   constructor(state: TransferState, firestore: AngularFirestoreOffline) {
     const doc = firestore.doc('test/1');
-    const key = makeStateKey(doc.ref.path);
-    const existing = state.get<any>(key, undefined);
+    const key = makeStateKey<unknown>(doc.ref.path);
+    const existing = state.get(key, undefined);
     this.testDocValue$ = firestore.doc('test/1').valueChanges().pipe(
       trace('firestore'),
       existing ? startWith(existing) : tap(it => state.set(key, it))

sample-compat/src/app/firestore-offline/firestore-offline.module.ts

@@ -4,6 +4,7 @@ import { FirebaseOptions } from 'firebase/app';
 import { USE_EMULATOR } from '@angular/fire/compat/firestore';
 import { AngularFirestore, SETTINGS, Settings } from '@angular/fire/compat/firestore';
 import { USE_EMULATOR as USE_AUTH_EMULATOR } from '@angular/fire/compat/auth';
+import { ɵAngularFireSchedulers } from '@angular/fire';
 
 export const FIRESTORE_OFFLINE = new InjectionToken<AngularFirestore>('my.firestore');
 
@@ -15,9 +16,10 @@ export class AngularFirestoreOffline extends AngularFirestore {
         // tslint:disable-next-line:ban-types
         @Inject(PLATFORM_ID) platformId: Object,
         zone: NgZone,
+        schedulers: ɵAngularFireSchedulers,
         @Optional() @Inject(USE_EMULATOR) useEmulator: any,
       ) {
-        super(options, 'offline', true, settings, platformId, zone, { synchronizeTabs: true }, useEmulator);
+        super(options, 'offline', true, settings, platformId, zone, schedulers, { synchronizeTabs: true }, useEmulator);
       }
 }
 

sample-compat/src/app/firestore/firestore.component.ts

@@ -21,8 +21,8 @@ export class FirestoreComponent implements OnInit {
 
   constructor(state: TransferState, firestore: AngularFirestore) {
     const doc = firestore.doc('test/1');
-    const key = makeStateKey(doc.ref.path);
-    const existing = state.get<any>(key, undefined);
+    const key = makeStateKey<unknown>(doc.ref.path);
+    const existing = state.get(key, undefined);
     this.testDocValue$ = firestore.doc('test/1').valueChanges().pipe(
       trace('firestore'),
       existing ? startWith(existing) : tap(it => state.set(key, it))

sample-compat/src/app/storage/storage.component.ts

@@ -25,8 +25,8 @@ export class StorageComponent implements OnInit {
 
   constructor(storage: AngularFireStorage, state: TransferState) {
     const icon = storage.ref('google-g.png');
-    const key = makeStateKey('google-icon-url');
-    const existing = state.get<string>(key, undefined);
+    const key = makeStateKey<unknown>('google-icon-url');
+    const existing = state.get(key, undefined);
     this.downloadUrl$ = existing ? of(existing) : icon.getDownloadURL().pipe(
       trace('storage'),
       tap(it => state.set(key, it)),

sample-compat/src/app/upboats/upboats.component.ts

@@ -21,8 +21,8 @@ export class UpboatsComponent implements OnInit {
     const collection = firestore.collection<Animal>('animals', ref =>
       ref.orderBy('upboats', 'desc').orderBy('updatedAt', 'desc')
     );
-    const key = makeStateKey(collection.ref.path);
-    const existing = state.get<Animal[]>(key, undefined);
+    const key = makeStateKey<Animal[]>(collection.ref.path);
+    const existing = state.get(key, undefined);
     this.animals = collection.snapshotChanges().pipe(
       trace('animals'),
       map(it => it.map(change => ({