Skip to content

🐛 Fix bug when resetting password #1171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tiangolo merged 1 commit into from
Apr 15, 2024
Merged

🐛 Fix bug when resetting password #1171

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions frontend/src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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: {
Expand All @@ -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;
}