From bf99f2d947bedc2305e82e1d8cf0ecc6bb9a1f0f Mon Sep 17 00:00:00 2001
From: Derek Burgman <derek@dereekb.com>
Date: Mon, 18 Apr 2022 10:51:30 -0500
Subject: [PATCH] feat: added dbxFirebaseLoginModule

- added DbxFirebaseLoginModule and related services for Firebase authentication
---
 .../modules/action/container/map.component.ts |  1 -
 .../form/component/example.form.component.ts  |  1 +
 .../app/modules/doc/modules/form/doc.form.ts  |  2 +-
 .../lib/auth/login/firebase.login.module.ts   |  7 +++++-
 .../dbx-firebase/src/lib/auth/login/index.ts  |  1 +
 .../lib/auth/login/login.button.component.ts  | 10 +++++++-
 .../lib/auth/login/login.email.component.ts   |  2 +-
 .../login/login.email.content.component.html  |  2 +-
 .../login/login.email.content.component.ts    | 12 +++++++---
 .../auth/login/login.email.form.component.ts  | 21 ++++++++++-------
 .../src/lib/auth/login/login.password.ts      |  7 ++++++
 .../src/lib/auth/login/login.service.ts       | 23 +++++++++++++++++--
 .../auth/login/register.email.component.ts    |  2 +-
 .../src/lib/form/io/form.changes.directive.ts | 18 ++++++++++-----
 .../dbx-form/src/lib/formly/template/login.ts |  9 +++++---
 15 files changed, 89 insertions(+), 29 deletions(-)
 create mode 100644 packages/dbx-firebase/src/lib/auth/login/login.password.ts

diff --git a/apps/demo/src/app/modules/doc/modules/action/container/map.component.ts b/apps/demo/src/app/modules/doc/modules/action/container/map.component.ts
index f892b1425..8368abdb7 100644
--- a/apps/demo/src/app/modules/doc/modules/action/container/map.component.ts
+++ b/apps/demo/src/app/modules/doc/modules/action/container/map.component.ts
@@ -20,7 +20,6 @@ export class DocActionMapComponent {
   saveThrottleTime = ms('2s');
 
   handleSaveDraft: HandleActionFunction<DocActionFormExampleValue, any> = (value: DocActionFormExampleValue) => {
-    console.log('Save?');
     return of(value).pipe(
       delay(ms('1s')),
       tap(() => {
diff --git a/apps/demo/src/app/modules/doc/modules/form/component/example.form.component.ts b/apps/demo/src/app/modules/doc/modules/form/component/example.form.component.ts
index cb49a7de2..125f33cad 100644
--- a/apps/demo/src/app/modules/doc/modules/form/component/example.form.component.ts
+++ b/apps/demo/src/app/modules/doc/modules/form/component/example.form.component.ts
@@ -19,6 +19,7 @@ import { map, Observable } from "rxjs";
 export class DocFormExampleComponent extends AbstractConfigAsyncFormlyFormDirective<any, FormlyFieldConfig[]> {
 
   value: any;
+
   readonly fields$: Observable<FormlyFieldConfig[]> = this.config$.pipe(map((fields: FormlyFieldConfig[]) => fields ?? []));
 
 }
diff --git a/apps/demo/src/app/modules/doc/modules/form/doc.form.ts b/apps/demo/src/app/modules/doc/modules/form/doc.form.ts
index eae63e344..c0e9f9921 100644
--- a/apps/demo/src/app/modules/doc/modules/form/doc.form.ts
+++ b/apps/demo/src/app/modules/doc/modules/form/doc.form.ts
@@ -30,7 +30,7 @@ export const DOC_FORM_ROUTES = [{
   detail: 'form wrappers',
   ref: 'doc.form.wrapper'
 }, {
-  icon: 'template',
+  icon: 'article',
   title: 'Templates',
   detail: 'form field templates',
   ref: 'doc.form.template'
diff --git a/packages/dbx-firebase/src/lib/auth/login/firebase.login.module.ts b/packages/dbx-firebase/src/lib/auth/login/firebase.login.module.ts
index a0812ba39..bcc12ed60 100644
--- a/packages/dbx-firebase/src/lib/auth/login/firebase.login.module.ts
+++ b/packages/dbx-firebase/src/lib/auth/login/firebase.login.module.ts
@@ -12,7 +12,7 @@ import { DbxFirebaseLoginComponent } from './login.component';
 import { DbxFirebaseLoginEmailComponent } from './login.email.component';
 import { DbxFirebaseLoginFacebookComponent } from './login.facebook.component';
 import { DbxFirebaseLoginGoogleComponent } from './login.google.component';
-import { DbxFirebaseAuthLoginProvider, DbxFirebaseAuthLoginService, DEFAULT_FIREBASE_AUTH_LOGIN_PROVIDERS_TOKEN, DEFAULT_FIREBASE_AUTH_LOGIN_TERMS_COMPONENT_CLASS_TOKEN } from './login.service';
+import { DbxFirebaseAuthLoginProvider, DbxFirebaseAuthLoginService, DEFAULT_FIREBASE_AUTH_LOGIN_PASSWORD_CONFIG_TOKEN, DEFAULT_FIREBASE_AUTH_LOGIN_PROVIDERS_TOKEN, DEFAULT_FIREBASE_AUTH_LOGIN_TERMS_COMPONENT_CLASS_TOKEN } from './login.service';
 import { DbxFirebaseRegisterComponent } from './register.component';
 import { DbxFirebaseLoginGitHubComponent } from './login.github.component';
 import { DbxFirebaseLoginTwitterComponent } from './login.twitter.component';
@@ -27,12 +27,14 @@ import { DbxFirebaseLoginTermsComponent } from './login.terms.component';
 import { DbxFirebaseLoginTermsViewComponent } from './login.terms.default.component';
 import { DbxFirebaseLoginContextBackButtonComponent } from './login.context.back.component';
 import { DbxFirebaseEmailRecoveryFormComponent } from './login.email.recovery.form.component';
+import { DbxFirebaseAuthLoginPasswordConfig } from './login.password';
 
 export abstract class DbxFirebaseLoginModuleRootConfig {
   abstract readonly tosUrl: string;
   abstract readonly privacyUrl: string;
   abstract readonly enabledLoginMethods: FirebaseLoginMethodType[] | true;
   abstract readonly termsComponentClass?: Type<any>;
+  abstract readonly passwordConfig?: DbxFirebaseAuthLoginPasswordConfig;
 }
 
 export function defaultFirebaseAuthLoginProvidersFactory(): DbxFirebaseAuthLoginProvider[] {
@@ -204,6 +206,9 @@ export class DbxFirebaseLoginModule {
       }, {
         provide: DEFAULT_FIREBASE_AUTH_LOGIN_TERMS_COMPONENT_CLASS_TOKEN,
         useValue: config.termsComponentClass
+      }, {
+        provide: DEFAULT_FIREBASE_AUTH_LOGIN_PASSWORD_CONFIG_TOKEN,
+        useValue: config.passwordConfig
       }, {
         provide: DbxFirebaseLoginModuleRootConfig,
         useValue: config
diff --git a/packages/dbx-firebase/src/lib/auth/login/index.ts b/packages/dbx-firebase/src/lib/auth/login/index.ts
index 51d331505..d99f912a8 100644
--- a/packages/dbx-firebase/src/lib/auth/login/index.ts
+++ b/packages/dbx-firebase/src/lib/auth/login/index.ts
@@ -12,6 +12,7 @@ export * from './login.github.component';
 export * from './login.google.component';
 export * from './login.list.component';
 export * from './login.microsoft.component';
+export * from './login.password';
 export * from './login.service';
 export * from './login';
 export * from './login.twitter.component';
diff --git a/packages/dbx-firebase/src/lib/auth/login/login.button.component.ts b/packages/dbx-firebase/src/lib/auth/login/login.button.component.ts
index 411d2bdc0..9271ea82a 100644
--- a/packages/dbx-firebase/src/lib/auth/login/login.button.component.ts
+++ b/packages/dbx-firebase/src/lib/auth/login/login.button.component.ts
@@ -104,7 +104,7 @@ export abstract class AbstractConfiguredDbxFirebaseLoginButtonDirective implemen
     readonly dbxFirebaseLoginContext: DbxFirebaseLoginContext) { }
 
   ngOnInit(): void {
-    const assets = this.dbxFirebaseAuthLoginService.getProviderAssets(this.loginProvider) ?? {};
+    const assets = this.assetConfig;
 
     this._config = {
       text: assets.loginText ?? `<loginText not configured>`,
@@ -118,6 +118,14 @@ export abstract class AbstractConfiguredDbxFirebaseLoginButtonDirective implemen
 
   abstract handleLogin(): Promise<any>;
 
+  get providerConfig() {
+    return this.dbxFirebaseAuthLoginService.getLoginProvider(this.loginProvider);
+  }
+
+  get assetConfig() {
+    return this.dbxFirebaseAuthLoginService.getProviderAssets(this.loginProvider) ?? {};
+  }
+
   get config() {
     return this._config;
   }
diff --git a/packages/dbx-firebase/src/lib/auth/login/login.email.component.ts b/packages/dbx-firebase/src/lib/auth/login/login.email.component.ts
index c9542e6cf..0cd34f76e 100644
--- a/packages/dbx-firebase/src/lib/auth/login/login.email.component.ts
+++ b/packages/dbx-firebase/src/lib/auth/login/login.email.component.ts
@@ -10,7 +10,7 @@ export class DbxFirebaseLoginEmailComponent extends AbstractConfiguredDbxFirebas
   readonly loginProvider = 'email';
 
   handleLogin(): Promise<any> {
-    return DbxFirebaseLoginEmailContentComponent.openEmailLoginContext(this.dbxFirebaseLoginContext, { loginMode: 'login' });
+    return DbxFirebaseLoginEmailContentComponent.openEmailLoginContext(this.dbxFirebaseLoginContext, { loginMode: 'login', passwordConfig: this.dbxFirebaseAuthLoginService.getPasswordConfig() });
   }
 
 }
diff --git a/packages/dbx-firebase/src/lib/auth/login/login.email.content.component.html b/packages/dbx-firebase/src/lib/auth/login/login.email.content.component.html
index 4c9fc3772..0379024a6 100644
--- a/packages/dbx-firebase/src/lib/auth/login/login.email.content.component.html
+++ b/packages/dbx-firebase/src/lib/auth/login/login.email.content.component.html
@@ -12,7 +12,7 @@
 <!-- Login View -->
 <ng-template #loginView>
   <ng-container dbxAction [dbxActionHandler]="handleLoginAction">
-    <dbx-firebase-email-form [loginMode]="loginMode" dbxActionForm [dbxFormSource]="emailFormValue">
+    <dbx-firebase-email-form [config]="formConfig" dbxActionForm [dbxFormSource]="emailFormValue">
     </dbx-firebase-email-form>
     <div class="dbx-firebase-login-email-forgot-prompt" *ngIf="isLoginMode">
       <dbx-link [anchor]="forgotAnchor">Forgot Password?</dbx-link>
diff --git a/packages/dbx-firebase/src/lib/auth/login/login.email.content.component.ts b/packages/dbx-firebase/src/lib/auth/login/login.email.content.component.ts
index 9daabc633..2fb13fdee 100644
--- a/packages/dbx-firebase/src/lib/auth/login/login.email.content.component.ts
+++ b/packages/dbx-firebase/src/lib/auth/login/login.email.content.component.ts
@@ -4,13 +4,13 @@ import { DbxFirebaseAuthService } from './../service/firebase.auth.service';
 import { firstValueFrom, from, tap, BehaviorSubject } from 'rxjs';
 import { Component, EventEmitter, OnDestroy } from "@angular/core";
 import { DbxFirebaseLoginContext } from "./login.context";
-import { DbxFirebaseEmailFormValue } from './login.email.form.component';
+import { DbxFirebaseEmailFormValue, DbxFirebaseEmailFormConfig } from './login.email.form.component';
 import { DbxFirebaseLoginMode } from './login';
 import { Inject } from '@angular/core';
 import { firebaseAuthErrorToReadableError } from '../error';
 import { Maybe } from '@dereekb/util';
 
-export interface DbxFirebaseLoginEmailContentComponentConfig {
+export interface DbxFirebaseLoginEmailContentComponentConfig extends DbxFirebaseEmailFormConfig {
   loginMode: DbxFirebaseLoginMode;
 }
 
@@ -21,6 +21,11 @@ export type DbxFirebaseLoginEmailContentMode = 'login' | 'recover' | 'recovering
 })
 export class DbxFirebaseLoginEmailContentComponent implements OnDestroy {
 
+  readonly formConfig: DbxFirebaseEmailFormConfig = {
+    loginMode: this.config.loginMode,
+    passwordConfig: this.config.passwordConfig
+  };
+
   emailFormValue: Maybe<DbxFirebaseEmailFormValue>;
   recoveryFormValue: Maybe<DbxFirebaseEmailRecoveryFormValue>;
 
@@ -31,7 +36,7 @@ export class DbxFirebaseLoginEmailContentComponent implements OnDestroy {
     onClick: () => {
       this.openRecovery();
     }
-  }
+  };
 
   readonly doneOrCancelled = new EventEmitter<boolean>();
 
@@ -66,6 +71,7 @@ export class DbxFirebaseLoginEmailContentComponent implements OnDestroy {
   get buttonText() {
     return this.config.loginMode === 'register' ? 'Register' : 'Log In';
   }
+
   readonly handleLoginAction: HandleActionFunction = (value: DbxFirebaseEmailFormValue) => {
     this.emailFormValue = value;
     this.recoveryFormValue = { email: value.username };    // cache value for recovery
diff --git a/packages/dbx-firebase/src/lib/auth/login/login.email.form.component.ts b/packages/dbx-firebase/src/lib/auth/login/login.email.form.component.ts
index a135c8da2..3ef6aa1ae 100644
--- a/packages/dbx-firebase/src/lib/auth/login/login.email.form.component.ts
+++ b/packages/dbx-firebase/src/lib/auth/login/login.email.form.component.ts
@@ -1,5 +1,5 @@
 import { Component, Input, OnDestroy } from "@angular/core";
-import { ProvideFormlyContext, AbstractAsyncFormlyFormDirective, usernamePasswordLoginFields, UsernameLoginFieldsConfig, DefaultUsernameLoginFieldsValue } from "@dereekb/dbx-form";
+import { TextPasswordFieldConfig, ProvideFormlyContext, AbstractAsyncFormlyFormDirective, usernamePasswordLoginFields, DefaultUsernameLoginFieldsValue } from "@dereekb/dbx-form";
 import { Maybe } from "@dereekb/util";
 import { FormlyFieldConfig } from "@ngx-formly/core";
 import { BehaviorSubject, map, Observable } from "rxjs";
@@ -7,6 +7,11 @@ import { DbxFirebaseLoginMode } from "./login";
 
 export interface DbxFirebaseEmailFormValue extends DefaultUsernameLoginFieldsValue { }
 
+export interface DbxFirebaseEmailFormConfig {
+  loginMode: DbxFirebaseLoginMode;
+  passwordConfig?: TextPasswordFieldConfig;
+}
+
 @Component({
   template: `<dbx-formly></dbx-formly>`,
   selector: 'dbx-firebase-email-form',
@@ -14,23 +19,23 @@ export interface DbxFirebaseEmailFormValue extends DefaultUsernameLoginFieldsVal
 })
 export class DbxFirebaseEmailFormComponent extends AbstractAsyncFormlyFormDirective<DbxFirebaseEmailFormValue> implements OnDestroy {
 
-  private _mode = new BehaviorSubject<DbxFirebaseLoginMode>('login');
+  private _config = new BehaviorSubject<DbxFirebaseEmailFormConfig>({ loginMode: 'login' });
 
-  readonly fields$: Observable<Maybe<FormlyFieldConfig[]>> = this._mode.pipe(
-    map((mode) => {
-      const fields: FormlyFieldConfig[] = usernamePasswordLoginFields({ username: 'email', verifyPassword: (mode === 'register') });
+  readonly fields$: Observable<Maybe<FormlyFieldConfig[]>> = this._config.pipe(
+    map(({ loginMode = 'login', passwordConfig }) => {
+      const fields: FormlyFieldConfig[] = usernamePasswordLoginFields({ username: 'email', password: passwordConfig, verifyPassword: (loginMode === 'register') });
       return fields;
     })
   );
 
   @Input()
-  set loginMode(loginMode: DbxFirebaseLoginMode) {
-    this._mode.next(loginMode);
+  set config(config: DbxFirebaseEmailFormConfig) {
+    this._config.next(config);
   }
 
   override ngOnDestroy() {
     super.ngOnDestroy();
-    this._mode.complete();
+    this._config.complete();
   }
 
 }
diff --git a/packages/dbx-firebase/src/lib/auth/login/login.password.ts b/packages/dbx-firebase/src/lib/auth/login/login.password.ts
new file mode 100644
index 000000000..e8a276137
--- /dev/null
+++ b/packages/dbx-firebase/src/lib/auth/login/login.password.ts
@@ -0,0 +1,7 @@
+import { TextPasswordFieldPasswordParameters } from "@dereekb/dbx-form";
+
+export interface DbxFirebaseAuthLoginPasswordConfig extends TextPasswordFieldPasswordParameters { }
+
+export const DEFAULT_FIREBASE_AUTH_LOGIN_PASSWORD_CONFIG: DbxFirebaseAuthLoginPasswordConfig = {
+  minLength: 6
+};
diff --git a/packages/dbx-firebase/src/lib/auth/login/login.service.ts b/packages/dbx-firebase/src/lib/auth/login/login.service.ts
index 63ceb2139..c56cc1431 100644
--- a/packages/dbx-firebase/src/lib/auth/login/login.service.ts
+++ b/packages/dbx-firebase/src/lib/auth/login/login.service.ts
@@ -2,15 +2,16 @@ import { mapIterable, addToSet, removeFromSet, Maybe, ArrayOrValue, filterMaybeV
 import { Inject, Injectable, InjectionToken, Optional, Type } from "@angular/core";
 import { FirebaseLoginMethodType, KnownFirebaseLoginMethodType } from "./login";
 import { DbxFirebaseLoginTermsViewComponent } from "./login.terms.default.component";
+import { DbxFirebaseAuthLoginPasswordConfig, DEFAULT_FIREBASE_AUTH_LOGIN_PASSWORD_CONFIG } from "./login.password";
 
 /**
  * Default providers to inject.
  */
 export const DEFAULT_FIREBASE_AUTH_LOGIN_PROVIDERS_TOKEN = new InjectionToken('DefaultDbxFirebaseAuthLoginProviders');
 export const DEFAULT_FIREBASE_AUTH_LOGIN_TERMS_COMPONENT_CLASS_TOKEN = new InjectionToken('DefaultDbxFirebaseAuthLoginTermsComponentClass');
+export const DEFAULT_FIREBASE_AUTH_LOGIN_PASSWORD_CONFIG_TOKEN = new InjectionToken('DefaultDbxFirebaseAuthLoginPasswordConfig');
 
-
-export interface DbxFirebaseAuthLoginProvider {
+export interface DbxFirebaseAuthLoginProvider<D = any> {
   /**
    * Login method key for this type.
    */
@@ -23,6 +24,12 @@ export interface DbxFirebaseAuthLoginProvider {
    * Custom registration type to use instead. If false, registration is not allowd for this type.
    */
   readonly registrationComponentClass?: Type<any> | false;
+  /**
+   * Custom data available to the components.
+   * 
+   * Components are responsible for knowing the typing information of this data.
+   */
+  readonly componentData?: D;
   /**
    * Asset configuration for this type.
    */
@@ -66,17 +73,21 @@ export interface DbxFirebaseAuthLoginProviderAssets {
 export class DbxFirebaseAuthLoginService {
 
   private _enableAll = false;
+  private _passwordConfig: DbxFirebaseAuthLoginPasswordConfig;
   private _providers = new Map<FirebaseLoginMethodType, DbxFirebaseAuthLoginProvider>();
   private _assets = new Map<FirebaseLoginMethodType, DbxFirebaseAuthLoginProviderAssets>();
   private _enabled = new Set<FirebaseLoginMethodType>();
 
   constructor(
     @Optional() @Inject(DEFAULT_FIREBASE_AUTH_LOGIN_PROVIDERS_TOKEN) defaultProviders: DbxFirebaseAuthLoginProvider[],
+    @Optional() @Inject(DEFAULT_FIREBASE_AUTH_LOGIN_PASSWORD_CONFIG_TOKEN) passwordConfig: DbxFirebaseAuthLoginPasswordConfig,
     @Optional() @Inject(DEFAULT_FIREBASE_AUTH_LOGIN_TERMS_COMPONENT_CLASS_TOKEN) readonly termsComponentClass: Type<any> = DbxFirebaseLoginTermsViewComponent
   ) {
     if (defaultProviders) {
       defaultProviders.forEach((x) => this.register(x, false));
     }
+
+    this._passwordConfig = passwordConfig ?? DEFAULT_FIREBASE_AUTH_LOGIN_PASSWORD_CONFIG;
   }
 
   /**
@@ -168,4 +179,12 @@ export class DbxFirebaseAuthLoginService {
     return this._assets.get(type);
   }
 
+  getPasswordConfig() {
+    return this._passwordConfig;
+  }
+
+  setPasswordConfig(passwordConfig: DbxFirebaseAuthLoginPasswordConfig) {
+    this._passwordConfig = passwordConfig;
+  }
+
 }
diff --git a/packages/dbx-firebase/src/lib/auth/login/register.email.component.ts b/packages/dbx-firebase/src/lib/auth/login/register.email.component.ts
index 3e28d66de..0a4277237 100644
--- a/packages/dbx-firebase/src/lib/auth/login/register.email.component.ts
+++ b/packages/dbx-firebase/src/lib/auth/login/register.email.component.ts
@@ -10,7 +10,7 @@ export class DbxFirebaseRegisterEmailComponent extends AbstractConfiguredDbxFire
   readonly loginProvider = 'email';
 
   handleLogin(): Promise<any> {
-    return DbxFirebaseLoginEmailContentComponent.openEmailLoginContext(this.dbxFirebaseLoginContext, { loginMode: 'register' });
+    return DbxFirebaseLoginEmailContentComponent.openEmailLoginContext(this.dbxFirebaseLoginContext, { loginMode: 'register', passwordConfig: this.dbxFirebaseAuthLoginService.getPasswordConfig() });
   }
 
 }
diff --git a/packages/dbx-form/src/lib/form/io/form.changes.directive.ts b/packages/dbx-form/src/lib/form/io/form.changes.directive.ts
index 08208a42c..33e23a5ae 100644
--- a/packages/dbx-form/src/lib/form/io/form.changes.directive.ts
+++ b/packages/dbx-form/src/lib/form/io/form.changes.directive.ts
@@ -1,10 +1,13 @@
 import { Directive, EventEmitter, Host, Output, OnInit } from '@angular/core';
 import { AbstractSubscriptionDirective } from '@dereekb/dbx-core';
-import { filter, first, mergeMap, delay } from 'rxjs';
+import { Maybe } from '@dereekb/util';
+import { first, mergeMap, delay, map } from 'rxjs';
 import { DbxForm } from '../form';
 
 /**
  * Used to see form value changes.
+ * 
+ * Emits undefined when the form is incomplete, and the value when the form is complete.
  */
 @Directive({
   selector: '[dbxFormValueChange]'
@@ -12,7 +15,7 @@ import { DbxForm } from '../form';
 export class DbxFormValueChangesDirective<T extends object = any> extends AbstractSubscriptionDirective implements OnInit {
 
   @Output()
-  readonly dbxFormValueChange = new EventEmitter<T>();
+  readonly dbxFormValueChange = new EventEmitter<Maybe<T>>();
 
   constructor(@Host() public readonly form: DbxForm) {
     super();
@@ -20,11 +23,14 @@ export class DbxFormValueChangesDirective<T extends object = any> extends Abstra
 
   ngOnInit(): void {
     this.sub = this.form.stream$.pipe(
-      filter(x => x.isComplete),
-      mergeMap(() => this.form.getValue().pipe(first())),
+      mergeMap((x) => this.form.getValue().pipe(first(), map((value) => ({ isComplete: x.isComplete, value })))),
       delay(0)
-    ).subscribe((value) => {
-      this.dbxFormValueChange.next(value);
+    ).subscribe(({ isComplete, value }) => {
+      if (isComplete) {
+        this.dbxFormValueChange.next(value);
+      } else {
+        this.dbxFormValueChange.next(undefined);
+      }
     });
   }
 
diff --git a/packages/dbx-form/src/lib/formly/template/login.ts b/packages/dbx-form/src/lib/formly/template/login.ts
index 437dca9cb..bc4c43862 100644
--- a/packages/dbx-form/src/lib/formly/template/login.ts
+++ b/packages/dbx-form/src/lib/formly/template/login.ts
@@ -4,6 +4,11 @@ import { fieldValuesAreEqualValidator } from '../../validator/field';
 import { FormlyFieldConfig } from "@ngx-formly/core";
 import { capitalizeFirstLetter, Maybe } from '@dereekb/util';
 
+/**
+ * Convenience interface for the password parameters configuration for a TextPasswordField.
+ */
+export interface TextPasswordFieldPasswordParameters extends Partial<Pick<TextFieldConfig, 'maxLength' | 'minLength' | 'pattern'>> { };
+
 /**
  * textPasswordField() configuration.
  */
@@ -31,8 +36,6 @@ export function textPasswordField(config?: TextPasswordFieldConfig): FormlyField
  * @returns 
  */
 export function textVerifyPasswordField(config?: TextPasswordFieldConfig): FormlyFieldConfig {
-  console.log('Verify password config: ', config);
-
   return textPasswordField({
     key: 'verifyPassword',
     label: 'Verify Password',
@@ -59,7 +62,7 @@ export function textPasswordWithVerifyFieldGroup(config: TextPasswordWithVerifyF
   const validators: any = {
     validation: [{
       errorPath: verifyPasswordFieldKey,
-      expression: fieldValuesAreEqualValidator({ message: 'The passwords do not match.' })
+      expression: fieldValuesAreEqualValidator({ keysFilter: [passwordFieldConfig.key, verifyPasswordField.key] as string[], message: 'The passwords do not match.' })
     }]
   };