From 461bc706888b15b6f6a97643c2a46f5db2678868 Mon Sep 17 00:00:00 2001 From: User Date: Mon, 15 Apr 2024 16:16:26 -0500 Subject: [PATCH 1/2] Fix bug when reseting password --- frontend/src/utils.ts | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/frontend/src/utils.ts b/frontend/src/utils.ts index ecdee91393..0768f5ecf4 100644 --- a/frontend/src/utils.ts +++ b/frontend/src/utils.ts @@ -1,8 +1,13 @@ export const emailPattern = { - value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i, + value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i, message: "Invalid email address", } +export const namePattern = { + value: /^[A-Za-z\s\u00C0-\u017F]{1,30}$/, + message: "Invalid name", +} + export const passwordRules = (isRequired = true) => { const rules: any = { minLength: { @@ -23,13 +28,15 @@ export const confirmPasswordRules = ( isRequired = true, ) => { const rules: any = { - validate: (value: string) => - value === getValues().password || "The passwords do not match", + validate: (value: string) => { + const password = getValues().password || getValues().new_password; + return value === password ? true : "The passwords do not match"; + } } if (isRequired) { - rules.required = "Password confirmation is required" + rules.required = "Password confirmation is required"; } - return rules + return rules; } From 2e93a29b8403b0b22dbf2d16c6bb6224a26745b3 Mon Sep 17 00:00:00 2001 From: User Date: Mon, 15 Apr 2024 16:30:56 -0500 Subject: [PATCH 2/2] Format utils --- frontend/src/utils.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/src/utils.ts b/frontend/src/utils.ts index 0768f5ecf4..3d504b3b9a 100644 --- a/frontend/src/utils.ts +++ b/frontend/src/utils.ts @@ -29,14 +29,14 @@ export const confirmPasswordRules = ( ) => { const rules: any = { validate: (value: string) => { - const password = getValues().password || getValues().new_password; - return value === password ? true : "The passwords do not match"; - } + const password = getValues().password || getValues().new_password + return value === password ? true : "The passwords do not match" + }, } if (isRequired) { - rules.required = "Password confirmation is required"; + rules.required = "Password confirmation is required" } - return rules; + return rules }