From 0c185a924c19cb8284ee06df00074b2bd45ba1fd Mon Sep 17 00:00:00 2001 From: louiaR Date: Wed, 13 May 2020 14:20:14 +0100 Subject: [PATCH 1/3] Update email validation regex --- src/components/InputField/validation.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/InputField/validation.js b/src/components/InputField/validation.js index aa2fda6a..b07b6619 100644 --- a/src/components/InputField/validation.js +++ b/src/components/InputField/validation.js @@ -1,7 +1,8 @@ const defaultValidationPatterns = { tel: /^[0-9 ]{11,}$/, number: /^[0-9]+$/, - email: /^([A-Za-z0-9_+-]+\.?)*[A-Za-z0-9_+-]+@[A-Za-z0-9]+([A-Za-z0-9_-]+\.?)*[A-Za-z0-9]+\.[A-Za-z]{2,}$/, + // eslint-disable-next-line no-useless-escape + email: /[a-z0-9!#$%&'*+\/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+\/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])/i, text: /^[\sA-Za-z0-9_.'&-]+$/, }; From be60aa96c8526110d7eb4cf6dac857e4bad1b3b9 Mon Sep 17 00:00:00 2001 From: louiaR Date: Mon, 18 May 2020 15:49:41 +0100 Subject: [PATCH 2/3] fix: Update email validation regex --- src/components/InputField/validation.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/InputField/validation.js b/src/components/InputField/validation.js index b07b6619..13069007 100644 --- a/src/components/InputField/validation.js +++ b/src/components/InputField/validation.js @@ -118,3 +118,4 @@ export default function fieldValidation(props, validation) { } return validation; } + From da29025333dd56a2be4e9e35f9c4ca5740cb6de9 Mon Sep 17 00:00:00 2001 From: louiaR Date: Mon, 18 May 2020 16:47:44 +0100 Subject: [PATCH 3/3] Clean up & add linting rule for no-useless-escape --- .eslintrc | 1 + src/components/InputField/validation.js | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.eslintrc b/.eslintrc index dfc2deda..479252b8 100644 --- a/.eslintrc +++ b/.eslintrc @@ -11,6 +11,7 @@ "react/forbid-prop-types": "off", "react/prop-types": "off", "react/no-array-index-key": "off", + "no-useless-escape": "off", "space-infix-ops": "off", "react/jsx-no-bind": "off", "object-shorthand": "off", diff --git a/src/components/InputField/validation.js b/src/components/InputField/validation.js index 13069007..1c0b6e79 100644 --- a/src/components/InputField/validation.js +++ b/src/components/InputField/validation.js @@ -1,7 +1,6 @@ const defaultValidationPatterns = { tel: /^[0-9 ]{11,}$/, number: /^[0-9]+$/, - // eslint-disable-next-line no-useless-escape email: /[a-z0-9!#$%&'*+\/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+\/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])/i, text: /^[\sA-Za-z0-9_.'&-]+$/, };