Add PasswordPolicyCustomStrengthOptions internal typing

Author: ch5zzy

packages/auth/src/core/auth/password_policy_impl.ts

@@ -17,6 +17,7 @@
 
 import { GetPasswordPolicyResponse } from '../../api/password_policy/get_password_policy';
 import {
+  PasswordPolicyCustomStrengthOptions,
   PasswordPolicyInternal,
   PasswordValidationStatusInternal
 } from '../../model/password_policy';
@@ -28,41 +29,38 @@ import { PasswordValidationStatus } from '../../model/public_types';
  * @internal
  */
 export class PasswordPolicyImpl implements PasswordPolicyInternal {
-  readonly customStrengthOptions: {
-    readonly minPasswordLength?: number;
-    readonly maxPasswordLength?: number;
-    readonly containsLowercaseLetter?: boolean;
-    readonly containsUppercaseLetter?: boolean;
-    readonly containsNumericCharacter?: boolean;
-    readonly containsNonAlphanumericCharacter?: boolean;
-  };
+  readonly customStrengthOptions: PasswordPolicyCustomStrengthOptions;
   readonly allowedNonAlphanumericCharacters?: string[];
   readonly schemaVersion: number;
 
   constructor(response: GetPasswordPolicyResponse) {
     // Only include custom strength options defined in the response.
     const responseOptions = response.customStrengthOptions;
-    this.customStrengthOptions = {
-      ...(responseOptions.minPasswordLength && {
-        minPasswordLength: responseOptions.minPasswordLength
-      }),
-      ...(responseOptions.maxPasswordLength && {
-        maxPasswordLength: responseOptions.maxPasswordLength
-      }),
-      ...(responseOptions.containsLowercaseCharacter && {
-        containsLowercaseLetter: responseOptions.containsLowercaseCharacter
-      }),
-      ...(responseOptions.containsUppercaseCharacter && {
-        containsUppercaseLetter: responseOptions.containsUppercaseCharacter
-      }),
-      ...(responseOptions.containsNumericCharacter && {
-        containsNumericCharacter: responseOptions.containsNumericCharacter
-      }),
-      ...(responseOptions.containsNonAlphanumericCharacter && {
-        containsNonAlphanumericCharacter:
-          responseOptions.containsNonAlphanumericCharacter
-      })
-    };
+    this.customStrengthOptions = {};
+    if (responseOptions.minPasswordLength) {
+      this.customStrengthOptions.minPasswordLength =
+        responseOptions.minPasswordLength;
+    }
+    if (responseOptions.maxPasswordLength) {
+      this.customStrengthOptions.maxPasswordLength =
+        responseOptions.maxPasswordLength;
+    }
+    if (responseOptions.containsLowercaseCharacter) {
+      this.customStrengthOptions.containsLowercaseLetter =
+        responseOptions.containsLowercaseCharacter;
+    }
+    if (responseOptions.containsUppercaseCharacter) {
+      this.customStrengthOptions.containsUppercaseLetter =
+        responseOptions.containsUppercaseCharacter;
+    }
+    if (responseOptions.containsNumericCharacter) {
+      this.customStrengthOptions.containsNumericCharacter =
+        responseOptions.containsNumericCharacter;
+    }
+    if (responseOptions.containsNonAlphanumericCharacter) {
+      this.customStrengthOptions.containsNonAlphanumericCharacter =
+        responseOptions.containsNonAlphanumericCharacter;
+    }
 
     if (response.allowedNonAlphanumericCharacters) {
       this.allowedNonAlphanumericCharacters =

packages/auth/src/model/password_policy.ts

@@ -25,6 +25,10 @@ import { PasswordPolicy, PasswordValidationStatus } from './public_types';
  * @internal
  */
 export interface PasswordPolicyInternal extends PasswordPolicy {
+  /**
+   * Requirements enforced by the password policy.
+   */
+  readonly customStrengthOptions: PasswordPolicyCustomStrengthOptions;
   /**
    * Schema version of the password policy.
    */
@@ -36,6 +40,39 @@ export interface PasswordPolicyInternal extends PasswordPolicy {
   validatePassword(password: string): PasswordValidationStatus;
 }
 
+/**
+ * Internal typing of the password policy custom strength options that is modifiable. This
+ * allows us to construct the strength options before storing them in the policy.
+ *
+ * @internal
+ */
+export interface PasswordPolicyCustomStrengthOptions {
+  /**
+   * Minimum password length.
+   */
+  minPasswordLength?: number;
+  /**
+   * Maximum password length.
+   */
+  maxPasswordLength?: number;
+  /**
+   * Whether the password should contain a lowercase letter.
+   */
+  containsLowercaseLetter?: boolean;
+  /**
+   * Whether the password should contain an uppercase letter.
+   */
+  containsUppercaseLetter?: boolean;
+  /**
+   * Whether the password should contain a numeric character.
+   */
+  containsNumericCharacter?: boolean;
+  /**
+   * Whether the password should contain a non-alphanumeric character.
+   */
+  containsNonAlphanumericCharacter?: boolean;
+}
+
 /**
  * Internal typing of password validation status that is modifiable. This allows us to
  * construct the validation status before returning it.