Fix typings where contains*caseLetter should have been contains*caseCharacter

ch5zzy · ch5zzy · commit da04e356e91b · 2023-07-07T13:56:51.000-07:00
diff --git a/docs-devsite/auth.passwordpolicy.md b/docs-devsite/auth.passwordpolicy.md
@@ -23,7 +23,7 @@ export interface PasswordPolicy
 |  Property | Type | Description |
 |  --- | --- | --- |
 |  [allowedNonAlphanumericCharacters](./auth.passwordpolicy.md#passwordpolicyallowednonalphanumericcharacters) | string\[\] | List of characters that are considered non-alphanumeric during validation. |
-|  [customStrengthOptions](./auth.passwordpolicy.md#passwordpolicycustomstrengthoptions) | { readonly minPasswordLength?: number; readonly maxPasswordLength?: number; readonly containsLowercaseLetter?: boolean; readonly containsUppercaseLetter?: boolean; readonly containsNumericCharacter?: boolean; readonly containsNonAlphanumericCharacter?: boolean; } | Requirements enforced by this password policy. |
+|  [customStrengthOptions](./auth.passwordpolicy.md#passwordpolicycustomstrengthoptions) | { readonly minPasswordLength?: number; readonly maxPasswordLength?: number; readonly containsLowercaseCharacter?: boolean; readonly containsUppercaseCharacter?: boolean; readonly containsNumericCharacter?: boolean; readonly containsNonAlphanumericCharacter?: boolean; } | Requirements enforced by this password policy. |
 
 ## PasswordPolicy.allowedNonAlphanumericCharacters
 
@@ -45,8 +45,8 @@ Requirements enforced by this password policy.
 readonly customStrengthOptions: {
         readonly minPasswordLength?: number;
         readonly maxPasswordLength?: number;
-        readonly containsLowercaseLetter?: boolean;
-        readonly containsUppercaseLetter?: boolean;
+        readonly containsLowercaseCharacter?: boolean;
+        readonly containsUppercaseCharacter?: boolean;
         readonly containsNumericCharacter?: boolean;
         readonly containsNonAlphanumericCharacter?: boolean;
     };
diff --git a/docs-devsite/auth.passwordvalidationstatus.md b/docs-devsite/auth.passwordvalidationstatus.md
@@ -22,23 +22,23 @@ export interface PasswordValidationStatus
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [containsLowercaseLetter](./auth.passwordvalidationstatus.md#passwordvalidationstatuscontainslowercaseletter) | boolean | Whether the password contains a lowercase letter, if required. |
+|  [containsLowercaseCharacter](./auth.passwordvalidationstatus.md#passwordvalidationstatuscontainslowercasecharacter) | boolean | Whether the password contains a lowercase character, if required. |
 |  [containsNonAlphanumericCharacter](./auth.passwordvalidationstatus.md#passwordvalidationstatuscontainsnonalphanumericcharacter) | boolean | Whether the password contains a non-alphanumeric character, if required. |
 |  [containsNumericCharacter](./auth.passwordvalidationstatus.md#passwordvalidationstatuscontainsnumericcharacter) | boolean | Whether the password contains a numeric character, if required. |
-|  [containsUppercaseLetter](./auth.passwordvalidationstatus.md#passwordvalidationstatuscontainsuppercaseletter) | boolean | Whether the password contains an uppercase letter, if required. |
+|  [containsUppercaseCharacter](./auth.passwordvalidationstatus.md#passwordvalidationstatuscontainsuppercasecharacter) | boolean | Whether the password contains an uppercase character, if required. |
 |  [isValid](./auth.passwordvalidationstatus.md#passwordvalidationstatusisvalid) | boolean | Whether the password meets all requirements. |
 |  [meetsMaxPasswordLength](./auth.passwordvalidationstatus.md#passwordvalidationstatusmeetsmaxpasswordlength) | boolean | Whether the password meets the maximum password length. |
 |  [meetsMinPasswordLength](./auth.passwordvalidationstatus.md#passwordvalidationstatusmeetsminpasswordlength) | boolean | Whether the password meets the minimum password length. |
 |  [passwordPolicy](./auth.passwordvalidationstatus.md#passwordvalidationstatuspasswordpolicy) | [PasswordPolicy](./auth.passwordpolicy.md#passwordpolicy_interface) | The policy used to validate the password. |
 
-## PasswordValidationStatus.containsLowercaseLetter
+## PasswordValidationStatus.containsLowercaseCharacter
 
-Whether the password contains a lowercase letter, if required.
+Whether the password contains a lowercase character, if required.
 
 <b>Signature:</b>
 
 ```typescript
-readonly containsLowercaseLetter?: boolean;
+readonly containsLowercaseCharacter?: boolean;
 ```
 
 ## PasswordValidationStatus.containsNonAlphanumericCharacter
@@ -61,14 +61,14 @@ Whether the password contains a numeric character, if required.
 readonly containsNumericCharacter?: boolean;
 ```
 
-## PasswordValidationStatus.containsUppercaseLetter
+## PasswordValidationStatus.containsUppercaseCharacter
 
-Whether the password contains an uppercase letter, if required.
+Whether the password contains an uppercase character, if required.
 
 <b>Signature:</b>
 
 ```typescript
-readonly containsUppercaseLetter?: boolean;
+readonly containsUppercaseCharacter?: boolean;
 ```
 
 ## PasswordValidationStatus.isValid
diff --git a/packages/auth/src/api/password_policy/get_password_policy.ts b/packages/auth/src/api/password_policy/get_password_policy.ts
@@ -37,8 +37,8 @@ export interface GetPasswordPolicyResponse {
   customStrengthOptions: {
     minPasswordLength?: number;
     maxPasswordLength?: number;
-    containsLowercaseLetter?: boolean;
-    containsUppercaseLetter?: boolean;
+    containsLowercaseCharacter?: boolean;
+    containsUppercaseCharacter?: boolean;
     containsNumericCharacter?: boolean;
     containsNonAlphanumericCharacter?: boolean;
   };
diff --git a/packages/auth/src/core/auth/auth_impl.test.ts b/packages/auth/src/core/auth/auth_impl.test.ts
@@ -805,7 +805,7 @@ describe('core/auth/auth_impl', () => {
       customStrengthOptions: {
         minPasswordLength: TEST_MIN_PASSWORD_LENGTH,
         maxPasswordLength: TEST_MAX_PASSWORD_LENGTH,
-        containsLowercaseLetter: true,
+        containsLowercaseCharacter: true,
         containsNumericCharacter: false,
         containsNonAlphanumericCharacter: true
       },
@@ -816,7 +816,7 @@ describe('core/auth/auth_impl', () => {
       customStrengthOptions: {
         minPasswordLength: TEST_MIN_PASSWORD_LENGTH,
         maxPasswordLength: TEST_MAX_PASSWORD_LENGTH,
-        containsLowercaseLetter: true,
+        containsLowercaseCharacter: true,
         containsNumericCharacter: true,
         containsNonAlphanumericCharacter: true
       },
@@ -827,8 +827,8 @@ describe('core/auth/auth_impl', () => {
       customStrengthOptions: {
         minPasswordLength: TEST_MIN_PASSWORD_LENGTH,
         maxPasswordLength: TEST_MAX_PASSWORD_LENGTH,
-        containsLowercaseLetter: true,
-        containsUppercaseLetter: true,
+        containsLowercaseCharacter: true,
+        containsUppercaseCharacter: true,
         containsNumericCharacter: true,
         containsNonAlphanumericCharacter: true
       },
@@ -937,7 +937,7 @@ describe('core/auth/auth_impl', () => {
           isValid: true,
           meetsMinPasswordLength: true,
           meetsMaxPasswordLength: true,
-          containsLowercaseLetter: true,
+          containsLowercaseCharacter: true,
           containsNonAlphanumericCharacter: true,
           passwordPolicy: cachedPasswordPolicy
         };
@@ -952,7 +952,7 @@ describe('core/auth/auth_impl', () => {
           isValid: false,
           meetsMinPasswordLength: false,
           meetsMaxPasswordLength: true,
-          containsLowercaseLetter: true,
+          containsLowercaseCharacter: true,
           containsNonAlphanumericCharacter: false,
           passwordPolicy: cachedPasswordPolicy
         };
@@ -967,7 +967,7 @@ describe('core/auth/auth_impl', () => {
           isValid: true,
           meetsMinPasswordLength: true,
           meetsMaxPasswordLength: true,
-          containsLowercaseLetter: true,
+          containsLowercaseCharacter: true,
           containsNumericCharacter: true,
           containsNonAlphanumericCharacter: true,
           passwordPolicy: cachedPasswordPolicyRequireNumeric
@@ -984,7 +984,7 @@ describe('core/auth/auth_impl', () => {
           isValid: false,
           meetsMinPasswordLength: true,
           meetsMaxPasswordLength: false,
-          containsLowercaseLetter: true,
+          containsLowercaseCharacter: true,
           containsNumericCharacter: true,
           containsNonAlphanumericCharacter: false,
           passwordPolicy: cachedPasswordPolicyRequireNumeric
@@ -1001,8 +1001,8 @@ describe('core/auth/auth_impl', () => {
           isValid: false,
           meetsMinPasswordLength: false,
           meetsMaxPasswordLength: true,
-          containsLowercaseLetter: true,
-          containsUppercaseLetter: true,
+          containsLowercaseCharacter: true,
+          containsUppercaseCharacter: true,
           containsNumericCharacter: true,
           containsNonAlphanumericCharacter: true,
           passwordPolicy: cachedPasswordPolicyRequireAll
@@ -1019,8 +1019,8 @@ describe('core/auth/auth_impl', () => {
           isValid: false,
           meetsMinPasswordLength: true,
           meetsMaxPasswordLength: false,
-          containsLowercaseLetter: true,
-          containsUppercaseLetter: true,
+          containsLowercaseCharacter: true,
+          containsUppercaseCharacter: true,
           containsNumericCharacter: true,
           containsNonAlphanumericCharacter: true,
           passwordPolicy: cachedPasswordPolicyRequireAll
@@ -1032,13 +1032,13 @@ describe('core/auth/auth_impl', () => {
         expect(status).to.eql(expectedValidationStatus);
       });
 
-      it('password that does not contain a lowercase letter is considered invalid', async () => {
+      it('password that does not contain a lowercase character is considered invalid', async () => {
         const expectedValidationStatus: PasswordValidationStatus = {
           isValid: false,
           meetsMinPasswordLength: true,
           meetsMaxPasswordLength: true,
-          containsLowercaseLetter: false,
-          containsUppercaseLetter: true,
+          containsLowercaseCharacter: false,
+          containsUppercaseCharacter: true,
           containsNumericCharacter: true,
           containsNonAlphanumericCharacter: true,
           passwordPolicy: cachedPasswordPolicyRequireAll
@@ -1050,13 +1050,13 @@ describe('core/auth/auth_impl', () => {
         expect(status).to.eql(expectedValidationStatus);
       });
 
-      it('password that does not contain an uppercase letter is considered invalid', async () => {
+      it('password that does not contain an uppercase character is considered invalid', async () => {
         const expectedValidationStatus: PasswordValidationStatus = {
           isValid: false,
           meetsMinPasswordLength: true,
           meetsMaxPasswordLength: true,
-          containsLowercaseLetter: true,
-          containsUppercaseLetter: false,
+          containsLowercaseCharacter: true,
+          containsUppercaseCharacter: false,
           containsNumericCharacter: true,
           containsNonAlphanumericCharacter: true,
           passwordPolicy: cachedPasswordPolicyRequireAll
@@ -1073,8 +1073,8 @@ describe('core/auth/auth_impl', () => {
           isValid: false,
           meetsMinPasswordLength: true,
           meetsMaxPasswordLength: true,
-          containsLowercaseLetter: true,
-          containsUppercaseLetter: true,
+          containsLowercaseCharacter: true,
+          containsUppercaseCharacter: true,
           containsNumericCharacter: false,
           containsNonAlphanumericCharacter: true,
           passwordPolicy: cachedPasswordPolicyRequireAll
@@ -1091,8 +1091,8 @@ describe('core/auth/auth_impl', () => {
           isValid: false,
           meetsMinPasswordLength: true,
           meetsMaxPasswordLength: true,
-          containsLowercaseLetter: true,
-          containsUppercaseLetter: true,
+          containsLowercaseCharacter: true,
+          containsUppercaseCharacter: true,
           containsNumericCharacter: true,
           containsNonAlphanumericCharacter: false,
           passwordPolicy: cachedPasswordPolicyRequireAll
@@ -1109,7 +1109,7 @@ describe('core/auth/auth_impl', () => {
           isValid: true,
           meetsMinPasswordLength: true,
           meetsMaxPasswordLength: true,
-          containsLowercaseLetter: true,
+          containsLowercaseCharacter: true,
           containsNonAlphanumericCharacter: true,
           passwordPolicy: cachedPasswordPolicy
         };
@@ -1123,7 +1123,7 @@ describe('core/auth/auth_impl', () => {
           isValid: false,
           meetsMinPasswordLength: true,
           meetsMaxPasswordLength: true,
-          containsLowercaseLetter: true,
+          containsLowercaseCharacter: true,
           containsNumericCharacter: false,
           containsNonAlphanumericCharacter: true,
           passwordPolicy: cachedPasswordPolicyRequireNumeric
diff --git a/packages/auth/src/core/auth/auth_impl.ts b/packages/auth/src/core/auth/auth_impl.ts
@@ -493,10 +493,10 @@ export class AuthImpl implements AuthInternal, _FirebaseService {
     }
 
     // Combine status into single isValid flag.
-    if (policy.customStrengthOptions.containsLowercaseLetter) {
+    if (policy.customStrengthOptions.containsLowercaseCharacter) {
       validFlag &&= lowerCaseFlag;
     }
-    if (policy.customStrengthOptions.containsUppercaseLetter) {
+    if (policy.customStrengthOptions.containsUppercaseCharacter) {
       validFlag &&= upperCaseFlag;
     }
     if (policy.customStrengthOptions.containsNumericCharacter) {
@@ -515,11 +515,11 @@ export class AuthImpl implements AuthInternal, _FirebaseService {
       ...(policy.customStrengthOptions.maxPasswordLength && {
         meetsMaxPasswordLength: maxLengthFlag
       }),
-      ...(policy.customStrengthOptions.containsLowercaseLetter && {
-        containsLowercaseLetter: lowerCaseFlag
+      ...(policy.customStrengthOptions.containsLowercaseCharacter && {
+        containsLowercaseCharacter: lowerCaseFlag
       }),
-      ...(policy.customStrengthOptions.containsUppercaseLetter && {
-        containsUppercaseLetter: upperCaseFlag
+      ...(policy.customStrengthOptions.containsUppercaseCharacter && {
+        containsUppercaseCharacter: upperCaseFlag
       }),
       ...(policy.customStrengthOptions.containsNumericCharacter && {
         containsNumericCharacter: numberFlag
diff --git a/packages/auth/src/model/public_types.ts b/packages/auth/src/model/public_types.ts
@@ -1274,11 +1274,11 @@ export interface PasswordPolicy {
     /**
      * Whether the password should contain a lowercase letter.
      */
-    readonly containsLowercaseLetter?: boolean;
+    readonly containsLowercaseCharacter?: boolean;
     /**
      * Whether the password should contain an uppercase letter.
      */
-    readonly containsUppercaseLetter?: boolean;
+    readonly containsUppercaseCharacter?: boolean;
     /**
      * Whether the password should contain a numeric character.
      */
@@ -1314,13 +1314,13 @@ export interface PasswordValidationStatus {
    */
   readonly meetsMaxPasswordLength?: boolean;
   /**
-   * Whether the password contains a lowercase letter, if required.
+   * Whether the password contains a lowercase character, if required.
    */
-  readonly containsLowercaseLetter?: boolean;
+  readonly containsLowercaseCharacter?: boolean;
   /**
-   * Whether the password contains an uppercase letter, if required.
+   * Whether the password contains an uppercase character, if required.
    */
-  readonly containsUppercaseLetter?: boolean;
+  readonly containsUppercaseCharacter?: boolean;
   /**
    * Whether the password contains a numeric character, if required.
    */
