diff --git a/Client/src/Validation/validation.js b/Client/src/Validation/validation.js index 26dd3d94a..86753e5f9 100644 --- a/Client/src/Validation/validation.js +++ b/Client/src/Validation/validation.js @@ -4,7 +4,7 @@ const nameSchema = joi .string() .max(50) .trim() - .pattern(new RegExp("^[A-Za-z]+$")) + .pattern(/^[A-Za-z]+$/) .messages({ "string.empty": "Name is required", "string.max": "Name must be less than 50 characters long", diff --git a/Server/validation/joi.js b/Server/validation/joi.js index 97476aa7a..f672b38eb 100644 --- a/Server/validation/joi.js +++ b/Server/validation/joi.js @@ -11,24 +11,26 @@ const loginValidation = joi.object({ .min(8) .required() .pattern( - new RegExp( - "^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[!@#$%^&*()])[A-Za-z0-9!@#$%^&*()]+$" - ) + /^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[!@#$%^&*()])[A-Za-z0-9!@#$%^&*()]+$/ ), }); const registerValidation = joi.object({ - firstname: joi.string().required().pattern(new RegExp("^[A-Za-z]+$")), - lastname: joi.string().required().pattern(new RegExp("^[A-Za-z]+$")), + firstname: joi + .string() + .required() + .pattern(/^[A-Za-z]+$/), + lastname: joi + .string() + .required() + .pattern(/^[A-Za-z]+$/), email: joi.string().email().required(), password: joi .string() .min(8) .required() .pattern( - new RegExp( - "^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[!@#$%^&*()])[A-Za-z0-9!@#$%^&*()]+$" - ) + /^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[!@#$%^&*()])[A-Za-z0-9!@#$%^&*()]+$/ ), profileImage: joi.any(), role: joi.string().required(), @@ -39,24 +41,20 @@ const editUserParamValidation = joi.object({ }); const editUserBodyValidation = joi.object({ - firstname: joi.string().pattern(new RegExp("^[A-Za-z]+$")), - lastname: joi.string().pattern(new RegExp("^[A-Za-z]+$")), + firstname: joi.string().pattern(/^[A-Za-z]+$/), + lastname: joi.string().pattern(/^[A-Za-z]+$/), profileImage: joi.any(), newPassword: joi .string() .min(8) .pattern( - new RegExp( - "^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[!@#$%^&*()])[A-Za-z0-9!@#$%^&*()]+$" - ) + /^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[!@#$%^&*()])[A-Za-z0-9!@#$%^&*()]+$/ ), password: joi .string() .min(8) .pattern( - new RegExp( - "^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[!@#$%^&*()])[A-Za-z0-9!@#$%^&*()]+$" - ) + /^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[!@#$%^&*()])[A-Za-z0-9!@#$%^&*()]+$/ ), deleteProfileImage: joi.boolean(), role: joi.string(), @@ -80,9 +78,7 @@ const newPasswordValidation = joi.object({ .min(8) .required() .pattern( - new RegExp( - "^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[!@#$%^&*()])[A-Za-z0-9!@#$%^&*()]+$" - ) + /^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[!@#$%^&*()])[A-Za-z0-9!@#$%^&*()]+$/ ), confirm: joi.string(), });