chore: update password scoring system for mt5

deriv-com · May 6, 2024 · 872d1be · 872d1be
1 parent 77f9864
commit 872d1be
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 8 deletions.
diff --git a/packages/wallets/src/components/Base/WalletPasswordField/WalletPasswordField.tsx b/packages/wallets/src/components/Base/WalletPasswordField/WalletPasswordField.tsx
@@ -5,6 +5,7 @@ import { dictionary } from '@zxcvbn-ts/language-common';
 import { passwordErrorMessage, warningMessages } from '../../../constants/password';
 import {
     calculateScore,
+    calculateScoreMT5,
     cfdSchema,
     mt5Schema,
     passwordKeys,
@@ -19,7 +20,7 @@ import PasswordViewerIcon from './PasswordViewerIcon';
 import './WalletPasswordField.scss';
 
 export const validatePassword = (password: string, mt5Policy: boolean) => {
-    const score = calculateScore(password);
+    const score = mt5Policy ? calculateScoreMT5(password) : calculateScore(password);
     let errorMessage = '';
 
     const options = { dictionary: { ...dictionary } };

diff --git a/packages/wallets/src/utils/password-validation.ts b/packages/wallets/src/utils/password-validation.ts
@@ -21,19 +21,16 @@ export type passwordKeys =
     | 'wordByItself';
 
 // Calculate Scores based on password strength
+// CFD Password Validation
 export const validPassword = (value: string) => {
     return passwordRegex.isPasswordValid.test(value);
 };
 
-export const validPasswordMT5 = (value: string) => {
-    return passwordRegex.isMT5PasswordValid.test(value);
-};
-
-export const isPasswordValid = (password: string) => {
+const isPasswordValid = (password: string) => {
     return passwordRegex.isPasswordValid.test(password) && passwordRegex.isLengthValid.test(password);
 };
 
-export const isPasswordModerate = (password: string) => {
+const isPasswordModerate = (password: string) => {
     const hasMoreThanOneSymbol = (password.match(/\W/g) ?? []).length > 1;
     return (
         isPasswordValid(password) &&
@@ -44,7 +41,7 @@ export const isPasswordModerate = (password: string) => {
     );
 };
 
-export const isPasswordStrong = (password: string) => {
+const isPasswordStrong = (password: string) => {
     const hasMoreThanOneSymbol = (password.match(/\W/g) ?? []).length > 1;
     return (
         isPasswordValid(password) &&
@@ -62,6 +59,44 @@ export const calculateScore = (password: string) => {
     if (isPasswordStrong(password)) return 4;
 };
 
+// MT5 Password Validation
+export const validPasswordMT5 = (value: string) => {
+    return passwordRegex.isMT5PasswordValid.test(value);
+};
+
+const isPasswordValidMT5 = (password: string) => {
+    return passwordRegex.isMT5PasswordValid.test(password) && passwordRegex.isMT5LengthValid.test(password);
+};
+
+const isPasswordModerateMT5 = (password: string) => {
+    const hasMoreThanOneSymbol = (password.match(/\W/g) ?? []).length > 1;
+    return (
+        isPasswordValidMT5(password) &&
+        hasMoreThanOneSymbol &&
+        password.length >= passwordValues.minLength &&
+        password.length < passwordValues.maxLengthMT5 &&
+        passwordRegex.isMT5LengthValid
+    );
+};
+
+const isPasswordStrongMT5 = (password: string) => {
+    const hasMoreThanOneSymbol = (password.match(/\W/g) ?? []).length > 1;
+    return (
+        isPasswordValidMT5(password) &&
+        hasMoreThanOneSymbol &&
+        password.length >= passwordValues.maxLengthMT5 &&
+        passwordRegex.isMT5LengthValid
+    );
+};
+
+export const calculateScoreMT5 = (password: string) => {
+    if (password.length === 0) return 0;
+    if (!isPasswordValidMT5(password)) return 1;
+    if (!isPasswordStrongMT5(password) && isPasswordValidMT5(password) && !isPasswordModerateMT5(password)) return 2;
+    if (!isPasswordStrongMT5(password) && isPasswordValidMT5(password) && isPasswordModerateMT5(password)) return 3;
+    if (isPasswordStrongMT5(password)) return 4;
+};
+
 // Password Schemas
 export const mt5Schema = Yup.string()
     .required(passwordErrorMessage.invalidLengthMT5)