From 4f5cb353842082942413bd12b0ef44c241adbfda Mon Sep 17 00:00:00 2001 From: Mohammad Jalali Date: Sun, 17 Sep 2023 17:16:46 +0330 Subject: [PATCH 1/2] TF-100 bugfix of password regex --- .../Form/ChangePassword/ChangePasswordContent.jsx | 2 +- .../expert-management/Form/CreateForm/CreateContent.jsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/dashboard/expert-management/Form/ChangePassword/ChangePasswordContent.jsx b/src/components/dashboard/expert-management/Form/ChangePassword/ChangePasswordContent.jsx index da9abab..b1c708c 100644 --- a/src/components/dashboard/expert-management/Form/ChangePassword/ChangePasswordContent.jsx +++ b/src/components/dashboard/expert-management/Form/ChangePassword/ChangePasswordContent.jsx @@ -21,7 +21,7 @@ const ChnagePasswordContent = ({rowId, fetchUrl, mutate, setOpenChangePasswordDi new_password: Yup.string() .required(t("ExpertMangement.error_message_new_password")) .matches( - /^(?=.*[0-9])(?=.*[A-Za-z!@#$%^&*])[A-Za-z!@#$%^&*\d]{8,}$/, + /^(?=.*[a-zA-Z])(?=.*\d).{8,}$/, t("ExpertMangement.error_message_new_password_regex") ), }); diff --git a/src/components/dashboard/expert-management/Form/CreateForm/CreateContent.jsx b/src/components/dashboard/expert-management/Form/CreateForm/CreateContent.jsx index c22783a..14e0032 100644 --- a/src/components/dashboard/expert-management/Form/CreateForm/CreateContent.jsx +++ b/src/components/dashboard/expert-management/Form/CreateForm/CreateContent.jsx @@ -67,7 +67,7 @@ const CreateContent = ({setOpenCreateDialog, mutate, fetchUrl}) => { password: Yup.string() .required(t("ExpertMangement.error_message_password")) .matches( - /^(?=.*[0-9])(?=.*[A-Za-z!@#$%^&*])[A-Za-z!@#$%^&*\d]{8,}$/, + /^(?=.*[a-zA-Z])(?=.*\d).{8,}$/, t("ExpertMangement.error_message_password_regex") ), position: Yup.string().required(t("ExpertMangement.error_message_position")), From ef2244584d9f70216b00ce048a323d3f7db5e751 Mon Sep 17 00:00:00 2001 From: Mohammad Jalali Date: Mon, 18 Sep 2023 10:21:09 +0330 Subject: [PATCH 2/2] bug fix for change password page --- src/components/dashboard/change-password/index.jsx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/components/dashboard/change-password/index.jsx b/src/components/dashboard/change-password/index.jsx index 0adc477..cd2b9fd 100644 --- a/src/components/dashboard/change-password/index.jsx +++ b/src/components/dashboard/change-password/index.jsx @@ -38,8 +38,11 @@ const DashboardChangePasswordComponent = () => { t("ChangePassword.error_message_current_password") ), new_password: Yup.string() - .min(8, t("ChangePassword.error_message_password_length")) - .required(t("ChangePassword.error_message_new_password")), + .required(t("ExpertMangement.error_message_new_password")) + .matches( + /^(?=.*[a-zA-Z])(?=.*\d).{8,}$/, + t("ExpertMangement.error_message_new_password_regex") + ), new_password_confirmation: Yup.string() .required(t("ChangePassword.error_message_confirm_password")) .test(