@dereekb/dbx-firebase 3.0.0 → 5.0.0

package/fesm2020/dereekb-dbx-firebase.mjs

@@ -17,10 +17,10 @@ import { addToSet, removeFromSet, filterMaybeValues, mapIterable, asArray, exclu
 import * as i3 from '@dereekb/dbx-web';
 import { DbxRouterAnchorModule, DbxReadableErrorModule, DbxActionModule, DbxButtonModule } from '@dereekb/dbx-web';
 import * as i1$1 from '@dereekb/dbx-form';
-import { AbstractAsyncFormlyFormDirective, usernamePasswordLoginFields, ProvideFormlyContext, AbstractSyncFormlyFormDirective, emailField, DbxFormIoModule, DbxFormModule, DbxFormlyModule, DbxFormActionModule, DbxFormFormlyTextFieldModule } from '@dereekb/dbx-form';
+import { AbstractAsyncFormlyFormDirective, usernamePasswordLoginFields, provideFormlyContext, AbstractSyncFormlyFormDirective, emailField, DbxFormIoModule, DbxFormModule, DbxFormlyModule, DbxFormActionModule, DbxFormFormlyTextFieldModule } from '@dereekb/dbx-form';
 import { initializeApp } from 'firebase/app';
 import * as i5 from '@angular/fire/app';
-import { provideFirebaseApp } from '@angular/fire/app';
+import { FirebaseApp, provideFirebaseApp } from '@angular/fire/app';
 import * as i3$2 from '@angular/fire/storage';
 import { provideStorage, getStorage, connectStorageEmulator } from '@angular/fire/storage';
 import * as i4$1 from '@angular/fire/functions';
@@ -28,7 +28,6 @@ import { provideFunctions, getFunctions, connectFunctionsEmulator, Functions } f
 import * as i1$2 from '@angular/fire/firestore';
 import { provideFirestore, getFirestore, connectFirestoreEmulator, enableIndexedDbPersistence, Firestore } from '@angular/fire/firestore';
 import { firebaseFirestoreContextFactory, iterationQueryDocChangeWatcher, firebaseQueryItemAccumulator, documentDataWithId } from '@dereekb/firebase';
-import { shareReplay as shareReplay$1 } from 'rxjs/operators';
 
 /**
  * Derives a user state from the input firebase auth service.
@@ -348,11 +347,11 @@ class DbxFirebaseLoginContext extends DbxInjectionContext {
  */
 class DbxFirebaseLoginButtonComponent {
     constructor() {
-        this.handleAction = (value) => {
+        this.handleAction = () => {
             const loginPromise = this.config.handleLogin();
             return from(loginPromise);
         };
-        this.onActionSuccess = (value) => {
+        this.onActionSuccess = () => {
             // todo: show checkmark on success?
         };
     }
@@ -692,13 +691,13 @@ class DbxFirebaseEmailFormComponent extends AbstractAsyncFormlyFormDirective {
     }
 }
 DbxFirebaseEmailFormComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.2", ngImport: i0, type: DbxFirebaseEmailFormComponent, deps: null, target: i0.ɵɵFactoryTarget.Component });
-DbxFirebaseEmailFormComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.3.2", type: DbxFirebaseEmailFormComponent, selector: "dbx-firebase-email-form", inputs: { config: "config" }, providers: [ProvideFormlyContext()], usesInheritance: true, ngImport: i0, template: `<dbx-formly></dbx-formly>`, isInline: true, components: [{ type: i1$1.DbxFormlyFormComponent, selector: "dbx-formly", exportAs: ["formly"] }] });
+DbxFirebaseEmailFormComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.3.2", type: DbxFirebaseEmailFormComponent, selector: "dbx-firebase-email-form", inputs: { config: "config" }, providers: [provideFormlyContext()], usesInheritance: true, ngImport: i0, template: `<dbx-formly></dbx-formly>`, isInline: true, components: [{ type: i1$1.DbxFormlyFormComponent, selector: "dbx-formly", exportAs: ["formly"] }] });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.2", ngImport: i0, type: DbxFirebaseEmailFormComponent, decorators: [{
             type: Component,
             args: [{
                     template: `<dbx-formly></dbx-formly>`,
                     selector: 'dbx-firebase-email-form',
-                    providers: [ProvideFormlyContext()]
+                    providers: [provideFormlyContext()]
                 }]
         }], propDecorators: { config: [{
                 type: Input
@@ -711,13 +710,13 @@ class DbxFirebaseEmailRecoveryFormComponent extends AbstractSyncFormlyFormDirect
     }
 }
 DbxFirebaseEmailRecoveryFormComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.2", ngImport: i0, type: DbxFirebaseEmailRecoveryFormComponent, deps: null, target: i0.ɵɵFactoryTarget.Component });
-DbxFirebaseEmailRecoveryFormComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.3.2", type: DbxFirebaseEmailRecoveryFormComponent, selector: "dbx-firebase-email-recovery-form", providers: [ProvideFormlyContext()], usesInheritance: true, ngImport: i0, template: `<dbx-formly></dbx-formly>`, isInline: true, components: [{ type: i1$1.DbxFormlyFormComponent, selector: "dbx-formly", exportAs: ["formly"] }] });
+DbxFirebaseEmailRecoveryFormComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.3.2", type: DbxFirebaseEmailRecoveryFormComponent, selector: "dbx-firebase-email-recovery-form", providers: [provideFormlyContext()], usesInheritance: true, ngImport: i0, template: `<dbx-formly></dbx-formly>`, isInline: true, components: [{ type: i1$1.DbxFormlyFormComponent, selector: "dbx-formly", exportAs: ["formly"] }] });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.2", ngImport: i0, type: DbxFirebaseEmailRecoveryFormComponent, decorators: [{
             type: Component,
             args: [{
                     template: `<dbx-formly></dbx-formly>`,
                     selector: 'dbx-firebase-email-recovery-form',
-                    providers: [ProvideFormlyContext()]
+                    providers: [provideFormlyContext()]
                 }]
         }] });
 
@@ -756,15 +755,12 @@ class DbxFirebaseLoginEmailContentComponent {
         this.handleRecoveryAction = (value) => {
             this.recoveryFormValue = value;
             this.emailFormValue = { username: value.email, password: '' };
-            let result = this.dbxFirebaseAuthService.sendPasswordResetEmail(value.email);
+            const result = this.dbxFirebaseAuthService.sendPasswordResetEmail(value.email);
             return from(result).pipe(tap(() => {
                 this.onRecoveringSuccess();
             }));
         };
     }
-    ngOnDestroy() {
-        this._emailMode.complete();
-    }
     static openEmailLoginContext(dbxFirebaseLoginContext, config) {
         return dbxFirebaseLoginContext.showContext({
             config: {
@@ -774,6 +770,9 @@ class DbxFirebaseLoginEmailContentComponent {
             use: (instance) => firstValueFrom(instance.doneOrCancelled)
         });
     }
+    ngOnDestroy() {
+        this._emailMode.complete();
+    }
     get loginMode() {
         return this.config.loginMode;
     }
@@ -792,6 +791,7 @@ class DbxFirebaseLoginEmailContentComponent {
     }
     // MARK: Recovering
     onRecoveringSuccess() {
+        // optionally override in parent
     }
     // MARK: Cancel
     onCancel() {
@@ -802,7 +802,7 @@ class DbxFirebaseLoginEmailContentComponent {
     }
 }
 DbxFirebaseLoginEmailContentComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.2", ngImport: i0, type: DbxFirebaseLoginEmailContentComponent, deps: [{ token: DbxFirebaseAuthService }, { token: DBX_INJECTION_COMPONENT_DATA }], target: i0.ɵɵFactoryTarget.Component });
-DbxFirebaseLoginEmailContentComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.3.2", type: DbxFirebaseLoginEmailContentComponent, selector: "ng-component", ngImport: i0, template: "<div class=\"dbx-firebase-login-email-content\">\n  <ng-container [ngSwitch]=\"emailMode$ | async\">\n    <ng-container *ngSwitchCase=\"'login'\">\n      <ng-container *ngTemplateOutlet=\"loginView\"></ng-container>\n    </ng-container>\n    <ng-container *ngSwitchCase=\"'recover'\">\n      <ng-container *ngTemplateOutlet=\"resetPassword\"></ng-container>\n    </ng-container>\n  </ng-container>\n</div>\n\n<!-- Login View -->\n<ng-template #loginView>\n  <ng-container dbxAction [dbxActionHandler]=\"handleLoginAction\">\n    <dbx-firebase-email-form [config]=\"formConfig\" dbxActionForm [dbxFormSource]=\"emailFormValue\">\n    </dbx-firebase-email-form>\n    <div class=\"dbx-firebase-login-email-forgot-prompt\" *ngIf=\"isLoginMode\">\n      <dbx-link [anchor]=\"forgotAnchor\">Forgot Password?</dbx-link>\n    </div>\n    <div class=\"dbx-flex\">\n      <dbx-button class=\"dbx-wide-button\" [text]=\"buttonText\" [raised]=\"true\" color=\"primary\" dbxActionButton>\n      </dbx-button>\n      <dbx-button-spacer></dbx-button-spacer>\n      <span class=\"dbx-spacer\"></span>\n      <button mat-flat-button (click)=\"onCancel()\">Cancel</button>\n    </div>\n    <dbx-error dbxActionError></dbx-error>\n  </ng-container>\n</ng-template>\n\n<!-- Reset Password View -->\n<ng-template #resetPassword>\n  <ng-container dbxAction [dbxActionHandler]=\"handleRecoveryAction\">\n    <dbx-firebase-email-recovery-form dbxActionForm [dbxFormSource]=\"recoveryFormValue\">\n    </dbx-firebase-email-recovery-form>\n    <p class=\"dbx-hint\">An email will be sent to the above address to help you reset your password.</p>\n    <div class=\"dbx-flex\">\n      <dbx-button class=\"dbx-wide-button\" text=\"Send Recovery Email\" [raised]=\"true\" color=\"primary\" dbxActionButton>\n      </dbx-button>\n      <span class=\"dbx-spacer\"></span>\n      <button mat-flat-button (click)=\"onCancelReset()\">Cancel Recovery</button>\n    </div>\n    <dbx-error dbxActionError></dbx-error>\n  </ng-container>\n</ng-template>\n", components: [{ type: DbxFirebaseEmailFormComponent, selector: "dbx-firebase-email-form", inputs: ["config"] }, { type: i3.DbxAnchorLinkComponent, selector: "dbx-link", inputs: ["anchor", "ref", "href"] }, { type: i3.DbxButtonComponent, selector: "dbx-button", inputs: ["type", "raised", "stroked", "flat", "color", "customButtonColor", "customTextColor", "customSpinnerColor"] }, { type: i4.MatButton, selector: "button[mat-button], button[mat-raised-button], button[mat-icon-button],             button[mat-fab], button[mat-mini-fab], button[mat-stroked-button],             button[mat-flat-button]", inputs: ["disabled", "disableRipple", "color"], exportAs: ["matButton"] }, { type: i3.DbxReadableErrorComponent, selector: "dbx-error", inputs: ["error"] }, { type: DbxFirebaseEmailRecoveryFormComponent, selector: "dbx-firebase-email-recovery-form" }], directives: [{ type: i6.NgSwitch, selector: "[ngSwitch]", inputs: ["ngSwitch"] }, { type: i6.NgSwitchCase, selector: "[ngSwitchCase]", inputs: ["ngSwitchCase"] }, { type: i6.NgTemplateOutlet, selector: "[ngTemplateOutlet]", inputs: ["ngTemplateOutletContext", "ngTemplateOutlet"] }, { type: i3$1.DbxActionDirective, selector: "dbx-action,[dbxAction],dbx-action-context,[dbxActionContext]", exportAs: ["action", "dbxAction"] }, { type: i3$1.DbxActionHandlerDirective, selector: "[dbxActionHandler]", inputs: ["dbxActionHandler"] }, { type: i1$1.DbxActionFormDirective, selector: "[dbxActionForm]", inputs: ["dbxActionFormValidator", "dbxActionFormModified", "formDisabledOnWorking"] }, { type: i1$1.DbxFormSourceDirective, selector: "[dbxFormSource]", inputs: ["dbxFormSourceMode", "dbxFormSource"] }, { type: i6.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { type: i3$1.DbxActionButtonDirective, selector: "[dbxActionButton]" }, { type: i3.DbxButtonSpacerDirective, selector: "dbx-button-spacer,dbxButtonSpacer" }, { type: i3.DbxActionErrorDirective, selector: "[dbxActionError]" }], pipes: { "async": i6.AsyncPipe } });
+DbxFirebaseLoginEmailContentComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.3.2", type: DbxFirebaseLoginEmailContentComponent, selector: "ng-component", ngImport: i0, template: "<div class=\"dbx-firebase-login-email-content\">\n  <ng-container [ngSwitch]=\"emailMode$ | async\">\n    <ng-container *ngSwitchCase=\"'login'\">\n      <ng-container *ngTemplateOutlet=\"loginView\"></ng-container>\n    </ng-container>\n    <ng-container *ngSwitchCase=\"'recover'\">\n      <ng-container *ngTemplateOutlet=\"resetPassword\"></ng-container>\n    </ng-container>\n  </ng-container>\n</div>\n\n<!-- Login View -->\n<ng-template #loginView>\n  <ng-container dbxAction [dbxActionHandler]=\"handleLoginAction\">\n    <dbx-firebase-email-form [config]=\"formConfig\" dbxActionForm [dbxFormSource]=\"emailFormValue\">\n    </dbx-firebase-email-form>\n    <div class=\"dbx-firebase-login-email-forgot-prompt\" *ngIf=\"isLoginMode\">\n      <dbx-link [anchor]=\"forgotAnchor\">Forgot Password?</dbx-link>\n    </div>\n    <div class=\"dbx-flex\">\n      <dbx-button class=\"dbx-wide-button\" [text]=\"buttonText\" [raised]=\"true\" color=\"primary\" dbxActionButton>\n      </dbx-button>\n      <dbx-button-spacer></dbx-button-spacer>\n      <span class=\"dbx-spacer\"></span>\n      <button mat-flat-button (click)=\"onCancel()\">Cancel</button>\n    </div>\n    <dbx-error dbxActionError></dbx-error>\n  </ng-container>\n</ng-template>\n\n<!-- Reset Password View -->\n<ng-template #resetPassword>\n  <ng-container dbxAction [dbxActionHandler]=\"handleRecoveryAction\">\n    <dbx-firebase-email-recovery-form dbxActionForm [dbxFormSource]=\"recoveryFormValue\">\n    </dbx-firebase-email-recovery-form>\n    <p class=\"dbx-hint\">An email will be sent to the above address to help you reset your password.</p>\n    <div class=\"dbx-flex\">\n      <dbx-button class=\"dbx-wide-button\" text=\"Send Recovery Email\" [raised]=\"true\" color=\"primary\" dbxActionButton>\n      </dbx-button>\n      <span class=\"dbx-spacer\"></span>\n      <button mat-flat-button (click)=\"onCancelReset()\">Cancel Recovery</button>\n    </div>\n    <dbx-error dbxActionError></dbx-error>\n  </ng-container>\n</ng-template>\n", components: [{ type: DbxFirebaseEmailFormComponent, selector: "dbx-firebase-email-form", inputs: ["config"] }, { type: i3.DbxAnchorLinkComponent, selector: "dbx-link", inputs: ["anchor", "ref", "href"] }, { type: i3.DbxButtonComponent, selector: "dbx-button", inputs: ["type", "raised", "stroked", "flat", "color", "customButtonColor", "customTextColor", "customSpinnerColor"] }, { type: i4.MatButton, selector: "button[mat-button], button[mat-raised-button], button[mat-icon-button],             button[mat-fab], button[mat-mini-fab], button[mat-stroked-button],             button[mat-flat-button]", inputs: ["disabled", "disableRipple", "color"], exportAs: ["matButton"] }, { type: i3.DbxReadableErrorComponent, selector: "dbx-error", inputs: ["error"] }, { type: DbxFirebaseEmailRecoveryFormComponent, selector: "dbx-firebase-email-recovery-form" }], directives: [{ type: i6.NgSwitch, selector: "[ngSwitch]", inputs: ["ngSwitch"] }, { type: i6.NgSwitchCase, selector: "[ngSwitchCase]", inputs: ["ngSwitchCase"] }, { type: i6.NgTemplateOutlet, selector: "[ngTemplateOutlet]", inputs: ["ngTemplateOutletContext", "ngTemplateOutlet"] }, { type: i3$1.DbxActionDirective, selector: "dbx-action,[dbxAction],dbx-action-context,[dbxActionContext]", exportAs: ["action", "dbxAction"] }, { type: i3$1.DbxActionHandlerDirective, selector: "[dbxActionHandler]", inputs: ["dbxActionHandler"] }, { type: i1$1.DbxActionFormDirective, selector: "[dbxActionForm]", inputs: ["dbxActionFormValidator", "dbxActionFormModified", "formDisabledOnWorking"] }, { type: i1$1.DbxFormSourceDirective, selector: "[dbxFormSource]", inputs: ["dbxFormSourceMode", "dbxFormSource"] }, { type: i6.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { type: i3$1.DbxActionButtonDirective, selector: "[dbxActionButton]" }, { type: i3.DbxButtonSpacerDirective, selector: "dbx-button-spacer,[dbxButtonSpacer]" }, { type: i3.DbxActionErrorDirective, selector: "[dbxActionError]" }], pipes: { "async": i6.AsyncPipe } });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.2", ngImport: i0, type: DbxFirebaseLoginEmailContentComponent, decorators: [{
             type: Component,
             args: [{ template: "<div class=\"dbx-firebase-login-email-content\">\n  <ng-container [ngSwitch]=\"emailMode$ | async\">\n    <ng-container *ngSwitchCase=\"'login'\">\n      <ng-container *ngTemplateOutlet=\"loginView\"></ng-container>\n    </ng-container>\n    <ng-container *ngSwitchCase=\"'recover'\">\n      <ng-container *ngTemplateOutlet=\"resetPassword\"></ng-container>\n    </ng-container>\n  </ng-container>\n</div>\n\n<!-- Login View -->\n<ng-template #loginView>\n  <ng-container dbxAction [dbxActionHandler]=\"handleLoginAction\">\n    <dbx-firebase-email-form [config]=\"formConfig\" dbxActionForm [dbxFormSource]=\"emailFormValue\">\n    </dbx-firebase-email-form>\n    <div class=\"dbx-firebase-login-email-forgot-prompt\" *ngIf=\"isLoginMode\">\n      <dbx-link [anchor]=\"forgotAnchor\">Forgot Password?</dbx-link>\n    </div>\n    <div class=\"dbx-flex\">\n      <dbx-button class=\"dbx-wide-button\" [text]=\"buttonText\" [raised]=\"true\" color=\"primary\" dbxActionButton>\n      </dbx-button>\n      <dbx-button-spacer></dbx-button-spacer>\n      <span class=\"dbx-spacer\"></span>\n      <button mat-flat-button (click)=\"onCancel()\">Cancel</button>\n    </div>\n    <dbx-error dbxActionError></dbx-error>\n  </ng-container>\n</ng-template>\n\n<!-- Reset Password View -->\n<ng-template #resetPassword>\n  <ng-container dbxAction [dbxActionHandler]=\"handleRecoveryAction\">\n    <dbx-firebase-email-recovery-form dbxActionForm [dbxFormSource]=\"recoveryFormValue\">\n    </dbx-firebase-email-recovery-form>\n    <p class=\"dbx-hint\">An email will be sent to the above address to help you reset your password.</p>\n    <div class=\"dbx-flex\">\n      <dbx-button class=\"dbx-wide-button\" text=\"Send Recovery Email\" [raised]=\"true\" color=\"primary\" dbxActionButton>\n      </dbx-button>\n      <span class=\"dbx-spacer\"></span>\n      <button mat-flat-button (click)=\"onCancelReset()\">Cancel Recovery</button>\n    </div>\n    <dbx-error dbxActionError></dbx-error>\n  </ng-container>\n</ng-template>\n" }]
@@ -979,14 +979,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.2", ngImpor
 
 class DbxFirebaseLoginContextBackButtonComponent {
     constructor() {
-        this.onCancel = new EventEmitter();
+        this.cancelLogin = new EventEmitter();
         this.anchor = {
-            onClick: () => this.onCancel.emit()
+            onClick: () => this.cancelLogin.emit()
         };
     }
 }
 DbxFirebaseLoginContextBackButtonComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.2", ngImport: i0, type: DbxFirebaseLoginContextBackButtonComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
-DbxFirebaseLoginContextBackButtonComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.3.2", type: DbxFirebaseLoginContextBackButtonComponent, selector: "dbx-firebase-login-context-back-button", outputs: { onCancel: "onCancel" }, ngImport: i0, template: `
+DbxFirebaseLoginContextBackButtonComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.3.2", type: DbxFirebaseLoginContextBackButtonComponent, selector: "dbx-firebase-login-context-back-button", outputs: { cancelLogin: "cancelLogin" }, ngImport: i0, template: `
     <dbx-link [anchor]="anchor">Choose other login method.</dbx-link>
   `, isInline: true, components: [{ type: i3.DbxAnchorLinkComponent, selector: "dbx-link", inputs: ["anchor", "ref", "href"] }] });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.2", ngImport: i0, type: DbxFirebaseLoginContextBackButtonComponent, decorators: [{
@@ -997,7 +997,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.2", ngImpor
     <dbx-link [anchor]="anchor">Choose other login method.</dbx-link>
   `
                 }]
-        }], propDecorators: { onCancel: [{
+        }], propDecorators: { cancelLogin: [{
                 type: Output
             }] } });
 
@@ -1286,7 +1286,8 @@ DbxFirebaseDefaultFirestoreProviderModule.ɵfac = i0.ɵɵngDeclareFactory({ minV
 DbxFirebaseDefaultFirestoreProviderModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "13.3.2", ngImport: i0, type: DbxFirebaseDefaultFirestoreProviderModule, imports: [i1$2.FirestoreModule] });
 DbxFirebaseDefaultFirestoreProviderModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "13.3.2", ngImport: i0, type: DbxFirebaseDefaultFirestoreProviderModule, imports: [[
             provideFirestore(((injector) => {
-                const firestore = getFirestore();
+                const firebaseApp = injector.get(FirebaseApp);
+                const firestore = getFirestore(firebaseApp);
                 const emulators = injector.get(DbxFirebaseParsedEmulatorsConfig, undefined);
                 if (emulators?.useEmulators && emulators?.firestore) {
                     connectFirestoreEmulator(firestore, emulators.firestore.host, emulators.firestore.port, {});
@@ -1300,7 +1301,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.2", ngImpor
             args: [{
                     imports: [
                         provideFirestore(((injector) => {
-                            const firestore = getFirestore();
+                            const firebaseApp = injector.get(FirebaseApp);
+                            const firestore = getFirestore(firebaseApp);
                             const emulators = injector.get(DbxFirebaseParsedEmulatorsConfig, undefined);
                             if (emulators?.useEmulators && emulators?.firestore) {
                                 connectFirestoreEmulator(firestore, emulators.firestore.host, emulators.firestore.port, {});
@@ -1320,7 +1322,8 @@ DbxFirebaseDefaultAuthProviderModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersio
 DbxFirebaseDefaultAuthProviderModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "13.3.2", ngImport: i0, type: DbxFirebaseDefaultAuthProviderModule, imports: [i1.AuthModule] });
 DbxFirebaseDefaultAuthProviderModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "13.3.2", ngImport: i0, type: DbxFirebaseDefaultAuthProviderModule, imports: [[
             provideAuth(((injector) => {
-                const auth = getAuth();
+                const firebaseApp = injector.get(FirebaseApp);
+                const auth = getAuth(firebaseApp);
                 const emulators = injector.get(DbxFirebaseParsedEmulatorsConfig, undefined);
                 if (emulators?.useEmulators && emulators?.auth) {
                     connectAuthEmulator(auth, `http://${emulators.auth.host}:${emulators.auth.port}`);
@@ -1333,7 +1336,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.2", ngImpor
             args: [{
                     imports: [
                         provideAuth(((injector) => {
-                            const auth = getAuth();
+                            const firebaseApp = injector.get(FirebaseApp);
+                            const auth = getAuth(firebaseApp);
                             const emulators = injector.get(DbxFirebaseParsedEmulatorsConfig, undefined);
                             if (emulators?.useEmulators && emulators?.auth) {
                                 connectAuthEmulator(auth, `http://${emulators.auth.host}:${emulators.auth.port}`);
@@ -1352,7 +1356,8 @@ DbxFirebaseDefaultStorageProviderModule.ɵfac = i0.ɵɵngDeclareFactory({ minVer
 DbxFirebaseDefaultStorageProviderModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "13.3.2", ngImport: i0, type: DbxFirebaseDefaultStorageProviderModule, imports: [i3$2.StorageModule] });
 DbxFirebaseDefaultStorageProviderModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "13.3.2", ngImport: i0, type: DbxFirebaseDefaultStorageProviderModule, imports: [[
             provideStorage(((injector) => {
-                const storage = getStorage();
+                const firebaseApp = injector.get(FirebaseApp);
+                const storage = getStorage(firebaseApp);
                 const emulators = injector.get(DbxFirebaseParsedEmulatorsConfig, undefined);
                 if (emulators?.useEmulators && emulators?.storage) {
                     connectStorageEmulator(storage, emulators.storage.host, emulators.storage.port, {});
@@ -1365,7 +1370,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.2", ngImpor
             args: [{
                     imports: [
                         provideStorage(((injector) => {
-                            const storage = getStorage();
+                            const firebaseApp = injector.get(FirebaseApp);
+                            const storage = getStorage(firebaseApp);
                             const emulators = injector.get(DbxFirebaseParsedEmulatorsConfig, undefined);
                             if (emulators?.useEmulators && emulators?.storage) {
                                 connectStorageEmulator(storage, emulators.storage.host, emulators.storage.port, {});
@@ -1384,7 +1390,10 @@ DbxFirebaseDefaultFunctionsProviderModule.ɵfac = i0.ɵɵngDeclareFactory({ minV
 DbxFirebaseDefaultFunctionsProviderModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "13.3.2", ngImport: i0, type: DbxFirebaseDefaultFunctionsProviderModule, imports: [i4$1.FunctionsModule] });
 DbxFirebaseDefaultFunctionsProviderModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "13.3.2", ngImport: i0, type: DbxFirebaseDefaultFunctionsProviderModule, imports: [[
             provideFunctions(((injector) => {
-                const functions = getFunctions();
+                const firebaseApp = injector.get(FirebaseApp);
+                const firebaseOptions = injector.get(DBX_FIREBASE_OPTIONS_TOKEN);
+                const { functionsRegionOrCustomDomain } = firebaseOptions;
+                const functions = getFunctions(firebaseApp, functionsRegionOrCustomDomain);
                 const emulators = injector.get(DbxFirebaseParsedEmulatorsConfig, undefined);
                 if (emulators?.useEmulators && emulators?.functions) {
                     connectFunctionsEmulator(functions, emulators.functions.host, emulators.functions.port);
@@ -1397,7 +1406,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.2", ngImpor
             args: [{
                     imports: [
                         provideFunctions(((injector) => {
-                            const functions = getFunctions();
+                            const firebaseApp = injector.get(FirebaseApp);
+                            const firebaseOptions = injector.get(DBX_FIREBASE_OPTIONS_TOKEN);
+                            const { functionsRegionOrCustomDomain } = firebaseOptions;
+                            const functions = getFunctions(firebaseApp, functionsRegionOrCustomDomain);
                             const emulators = injector.get(DbxFirebaseParsedEmulatorsConfig, undefined);
                             if (emulators?.useEmulators && emulators?.functions) {
                                 connectFunctionsEmulator(functions, emulators.functions.host, emulators.functions.port);
@@ -1423,29 +1435,29 @@ class DbxFirebaseDefaultFirebaseProvidersModule {
     }
 }
 DbxFirebaseDefaultFirebaseProvidersModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.2", ngImport: i0, type: DbxFirebaseDefaultFirebaseProvidersModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-DbxFirebaseDefaultFirebaseProvidersModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "13.3.2", ngImport: i0, type: DbxFirebaseDefaultFirebaseProvidersModule, imports: [DbxFirebaseDefaultFirestoreProviderModule, DbxFirebaseDefaultAuthProviderModule, DbxFirebaseDefaultStorageProviderModule, DbxFirebaseDefaultFunctionsProviderModule, i5.FirebaseAppModule] });
+DbxFirebaseDefaultFirebaseProvidersModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "13.3.2", ngImport: i0, type: DbxFirebaseDefaultFirebaseProvidersModule, imports: [i5.FirebaseAppModule, DbxFirebaseDefaultFirestoreProviderModule, DbxFirebaseDefaultAuthProviderModule, DbxFirebaseDefaultStorageProviderModule, DbxFirebaseDefaultFunctionsProviderModule] });
 DbxFirebaseDefaultFirebaseProvidersModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "13.3.2", ngImport: i0, type: DbxFirebaseDefaultFirebaseProvidersModule, imports: [[
-            DbxFirebaseDefaultFirestoreProviderModule,
-            DbxFirebaseDefaultAuthProviderModule,
-            DbxFirebaseDefaultStorageProviderModule,
-            DbxFirebaseDefaultFunctionsProviderModule,
             provideFirebaseApp(((injector) => {
                 const firebaseOptions = injector.get(DBX_FIREBASE_OPTIONS_TOKEN);
                 return initializeApp(firebaseOptions);
-            }))
+            })),
+            DbxFirebaseDefaultFirestoreProviderModule,
+            DbxFirebaseDefaultAuthProviderModule,
+            DbxFirebaseDefaultStorageProviderModule,
+            DbxFirebaseDefaultFunctionsProviderModule
         ]] });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.2", ngImport: i0, type: DbxFirebaseDefaultFirebaseProvidersModule, decorators: [{
             type: NgModule,
             args: [{
                     imports: [
-                        DbxFirebaseDefaultFirestoreProviderModule,
-                        DbxFirebaseDefaultAuthProviderModule,
-                        DbxFirebaseDefaultStorageProviderModule,
-                        DbxFirebaseDefaultFunctionsProviderModule,
                         provideFirebaseApp(((injector) => {
                             const firebaseOptions = injector.get(DBX_FIREBASE_OPTIONS_TOKEN);
                             return initializeApp(firebaseOptions);
-                        }))
+                        })),
+                        DbxFirebaseDefaultFirestoreProviderModule,
+                        DbxFirebaseDefaultAuthProviderModule,
+                        DbxFirebaseDefaultStorageProviderModule,
+                        DbxFirebaseDefaultFunctionsProviderModule
                     ]
                 }]
         }] });
@@ -1928,7 +1940,7 @@ class DbxFirebaseDocumentStoreRouteIdDirective extends AbstractSubscriptionDirec
         this.idParamKey$ = this._idParamKey.asObservable();
         this.idFromParams$ = combineLatest([this.idParamKey$, this.dbxRouterService.params$]).pipe(map(([key, params]) => {
             return params[key] ?? undefined;
-        }), distinctUntilChanged(), shareReplay$1(1));
+        }), distinctUntilChanged(), shareReplay(1));
     }
     ngOnInit() {
         this.sub = this.dbxFirebaseDocumentStoreDirective.store.setId(this.idFromParams$);
@@ -2073,7 +2085,7 @@ class AbstractDbxFirebaseDocumentStore extends LockSetComponentStore {
         this.id$ = this.document$.pipe(map(x => x.id), shareReplay());
         this.ref$ = this.document$.pipe(map(x => x.documentRef), shareReplay());
         this.snapshot$ = this.document$.pipe(switchMap(x => x.accessor.stream()), shareReplay(1));
-        this.snapshotLoadingState$ = this.currentDocument$.pipe(switchMap(_ => loadingStateFromObs(this.snapshot$)), shareReplay(1));
+        this.snapshotLoadingState$ = this.currentDocument$.pipe(switchMap(() => loadingStateFromObs(this.snapshot$)), shareReplay(1));
         this.currentData$ = this.document$.pipe(switchMap(x => x.accessor.stream().pipe(map(y => documentDataWithId(y)))), shareReplay(1));
         this.data$ = this.currentDocument$.pipe(switchMap(() => this.currentData$.pipe(filterMaybe())), shareReplay(1));
         this.dataLoadingState$ = this.snapshotLoadingState$.pipe(map((x) => {