test(clerk-js): Update password complexity tests

clerk · Jun 29, 2023 · ae0aad0 · ae0aad0
1 parent e496fc3
commit ae0aad0
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 74 deletions.
diff --git a/.changeset/forty-hornets-burn.md b/.changeset/forty-hornets-burn.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/packages/clerk-js/src/ui/hooks/__tests__/usePasswordComplexity.test.tsx b/packages/clerk-js/src/ui/hooks/__tests__/usePasswordComplexity.test.tsx
@@ -20,7 +20,7 @@ describe('usePasswordComplexity', () => {
     const { result } = renderHook(defaultRenderer, { wrapper });
 
     await act(() => {
-      result.current.setPassword('password1');
+      result.current.getComplexity('password1');
     });
 
     expect(result.current.password).toBe('password1');
@@ -31,7 +31,7 @@ describe('usePasswordComplexity', () => {
     const { result } = renderHook(defaultRenderer, { wrapper });
 
     await act(() => {
-      result.current.setPassword('thispasswordfails');
+      result.current.getComplexity('thispasswordfails');
     });
 
     expect(result.current.hasFailedComplexity).toBe(true);
@@ -43,7 +43,7 @@ describe('usePasswordComplexity', () => {
     const { result } = renderHook(defaultRenderer, { wrapper });
 
     await act(() => {
-      result.current.setPassword('th1sp@sswordPasses');
+      result.current.getComplexity('th1sp@sswordPasses');
     });
 
     expect(result.current.hasFailedComplexity).toBe(false);
@@ -55,7 +55,7 @@ describe('usePasswordComplexity', () => {
     const { result } = renderHook(defaultRenderer, { wrapper });
 
     await act(() => {
-      result.current.setPassword('thispasswordfails');
+      result.current.getComplexity('thispasswordfails');
     });
 
     expect(result.current.failedValidations).toHaveProperty('require_uppercase');
@@ -66,7 +66,7 @@ describe('usePasswordComplexity', () => {
     expect(result.current.failedValidations).not.toHaveProperty('min_length');
 
     await act(() => {
-      result.current.setPassword(`thispasswordfails"`);
+      result.current.getComplexity(`thispasswordfails"`);
     });
 
     expect(result.current.failedValidations).not.toHaveProperty('require_special_char');
@@ -89,7 +89,7 @@ describe('usePasswordComplexity', () => {
     });
 
     await act(() => {
-      result.current.setPassword('@');
+      result.current.getComplexity('@');
     });
 
     expect(result.current.failedValidations).not.toHaveProperty('require_special_char');
@@ -112,66 +112,48 @@ describe('usePasswordComplexity', () => {
     });
 
     await act(() => {
-      result.current.setPassword('[');
+      result.current.getComplexity('[');
     });
 
     expect(result.current.failedValidations).not.toHaveProperty('require_special_char');
 
     await act(() => {
-      result.current.setPassword(']');
+      result.current.getComplexity(']');
     });
 
     expect(result.current.failedValidations).not.toHaveProperty('require_special_char');
 
     await act(() => {
-      result.current.setPassword('[test]');
+      result.current.getComplexity('[test]');
     });
 
     expect(result.current.failedValidations).not.toHaveProperty('require_special_char');
 
     await act(() => {
-      result.current.setPassword('test[]');
+      result.current.getComplexity('test[]');
     });
 
     expect(result.current.failedValidations).not.toHaveProperty('require_special_char');
 
     await act(() => {
-      result.current.setPassword('[!"#$%&\'()*+,-./:;<=>?@^_`{|}~]');
+      result.current.getComplexity('[!"#$%&\'()*+,-./:;<=>?@^_`{|}~]');
     });
 
     expect(result.current.failedValidations).not.toHaveProperty('require_special_char');
   });
 
-  it('returns an object with all validations and their status (true:passed, false:failed)', async () => {
-    const { wrapper } = await createFixtures();
-    const { result } = renderHook(defaultRenderer, { wrapper });
-
-    await act(() => {
-      result.current.setPassword('thispasswordfails');
-    });
-
-    expect(result.current.passwordComplexity).toMatchObject({
-      max_length: true,
-      min_length: true,
-      require_special_char: false,
-      require_numbers: false,
-      require_lowercase: true,
-      require_uppercase: false,
-    });
-  });
-
   it('returns error message with localized conjunction', async () => {
     const { wrapper } = await createFixtures();
     const { result } = renderHook(defaultRenderer, { wrapper });
 
     await act(() => {
-      result.current.setPassword('@aP');
+      result.current.getComplexity('@aP');
     });
 
     expect(result.current.failedValidationsText).toBe('Your password must contain 8 or more characters and a number');
 
     await act(() => {
-      result.current.setPassword('aP');
+      result.current.getComplexity('aP');
     });
 
     expect(result.current.failedValidationsText).toBe(

diff --git a/packages/clerk-js/src/ui/hooks/usePasswordComplexity.ts b/packages/clerk-js/src/ui/hooks/usePasswordComplexity.ts
@@ -4,10 +4,6 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
 import { LocalizationKey, localizationKeys, useLocalizations } from '../localization';
 import { canUseListFormat } from '../utils';
 
-// type ComplexityErrorMessages = {
-//   [key in keyof Partial<Omit<PasswordSettingsData, 'disable_hibp' | 'min_zxcvbn_strength' | 'show_zxcvbn'>>]: string;
-// };
-
 export type ComplexityErrors = {
   [key in keyof Partial<Omit<PasswordSettingsData, 'disable_hibp' | 'min_zxcvbn_strength' | 'show_zxcvbn'>>]?: boolean;
 };
@@ -91,16 +87,6 @@ export const generateErrorTextUtil = ({
   return `${t(localizationKeys('unstable__errors.passwordComplexity.sentencePrefix'))} ${messageWithPrefix}`;
 };
 
-// const useTestComplexityCases = ({
-//   allowed_special_characters,
-// }: Pick<UsePasswordComplexityConfig, 'allowed_special_characters'>) => {
-//   return useMemo(() => {
-//     return {
-//       testComplexityCases: createTestComplexityCases({ allowed_special_characters }),
-//     };
-//   }, [allowed_special_characters]);
-// };
-
 const validate = (password: string, config: UsePasswordComplexityConfig): ComplexityErrors => {
   const { max_length, min_length, require_special_char, require_lowercase, require_numbers, require_uppercase } =
     config;
@@ -149,35 +135,15 @@ export const usePasswordComplexity = (config: UsePasswordComplexityConfig) => {
     getComplexity('');
   }, []);
 
-  // const errorMessages = useMemo(
-  //   () =>
-  //     ({
-  //       max_length: t(localizationKeys('unstable__errors.passwordComplexity.maximumLength', { length: max_length })),
-  //       min_length: t(localizationKeys('unstable__errors.passwordComplexity.minimumLength', { length: min_length })),
-  //       require_numbers: t(localizationKeys('unstable__errors.passwordComplexity.requireNumbers')),
-  //       require_lowercase: t(localizationKeys('unstable__errors.passwordComplexity.requireLowercase')),
-  //       require_uppercase: t(localizationKeys('unstable__errors.passwordComplexity.requireUppercase')),
-  //       require_special_char: t(localizationKeys('unstable__errors.passwordComplexity.requireSpecialCharacter')),
-  //     } satisfies ComplexityErrorMessages),
-  //   [min_length],
-  // );
-
-  // const passwordComplexity = useMemo(() => {
-  //   return testComplexityCases(password, {
-  //     maxLength: max_length,
-  //     minLength: min_length,
-  //   });
-  // }, [password, min_length, max_length]);
-
-  // const hasPassedComplexity = useMemo(
-  //   () => !!password && Object.keys(failedValidations || {}).length === 0,
-  //   [failedValidations, password],
-  // );
-  //
-  // const hasFailedComplexity = useMemo(
-  //   () => !!password && Object.keys(failedValidations || {}).length > 0,
-  //   [failedValidations, password],
-  // );
+  const hasPassedComplexity = useMemo(
+    () => !!password && Object.keys(failedValidations || {}).length === 0,
+    [failedValidations, password],
+  );
+
+  const hasFailedComplexity = useMemo(
+    () => !!password && Object.keys(failedValidations || {}).length > 0,
+    [failedValidations, password],
+  );
 
   const generateErrorText = useCallback(
     (failedValidations: ComplexityErrors | undefined) => {
@@ -207,5 +173,7 @@ export const usePasswordComplexity = (config: UsePasswordComplexityConfig) => {
     getComplexity,
     failedValidations,
     failedValidationsText,
+    hasFailedComplexity,
+    hasPassedComplexity,
   };
 };