From b4a7ffff8d6de022ed7aed354405dc3071ecb8e7 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Wed, 7 Dec 2016 12:58:49 +0000 Subject: [PATCH 1/2] Add Natural England to gov. email domains list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit > I cannot register as the Email address field will not accept my email > address format (.org.uk). Natural England is a non-departmental > government body sponsored by Defra (Department for Environment, Food > and Rural Affairs). Can you register me on the system or change the > system so it will accept my email address? – Deskpro ticket > Natural England is an executive non-departmental public body, > sponsored by the Department for Environment, Food & Rural Affairs. – https://www.gov.uk/government/organisations/natural-england *** Checks out… --- config.py | 3 ++- tests/app/main/test_validators.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/config.py b/config.py index b53dbbfb3..12659dc91 100644 --- a/config.py +++ b/config.py @@ -68,7 +68,8 @@ class Config(object): r"valtech\.co\.uk", r"cgi\.com", r"capita\.co\.uk", - r"ucds\.email" + r"ucds\.email", + r"naturalengland\.org\.uk", ] diff --git a/tests/app/main/test_validators.py b/tests/app/main/test_validators.py index 4e09bb61c..cc9c759e3 100644 --- a/tests/app/main/test_validators.py +++ b/tests/app/main/test_validators.py @@ -81,7 +81,8 @@ def _gen_mock_field(x): 'test@GOV.PoliCe.uk', 'test@valtech.co.uk', 'test@cgi.com', - 'test@ucds.email' + 'test@ucds.email', + 'test@naturalengland.org.uk', ]) def test_valid_list_of_white_list_email_domains(app_, email): with app_.test_request_context(): From db6bb77d7472f0fc9c4a4e1b0e92151698296c80 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Wed, 7 Dec 2016 13:57:26 +0000 Subject: [PATCH 2/2] =?UTF-8?q?Don=E2=80=99t=20allow=20suppliers=20to=20si?= =?UTF-8?q?gn=20up=20for=20own=20accounts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Suppliers need to be invited by people who work for the government. People who work for the government can invite anyone to join their team, no matter what their email address is. So there’s no need for these domains to be in the list now. --- config.py | 6 ------ tests/app/main/test_validators.py | 2 -- 2 files changed, 8 deletions(-) diff --git a/config.py b/config.py index 12659dc91..ec929e34d 100644 --- a/config.py +++ b/config.py @@ -61,13 +61,7 @@ class Config(object): r"nhs\.uk", r"nhs\.net", r"police\.uk", - r"kainos\.com", - r"salesforce\.com", - r"bitzesty\.com", r"dclgdatamart\.co\.uk", - r"valtech\.co\.uk", - r"cgi\.com", - r"capita\.co\.uk", r"ucds\.email", r"naturalengland\.org\.uk", ] diff --git a/tests/app/main/test_validators.py b/tests/app/main/test_validators.py index cc9c759e3..672666bf5 100644 --- a/tests/app/main/test_validators.py +++ b/tests/app/main/test_validators.py @@ -79,8 +79,6 @@ def _gen_mock_field(x): 'test@police.uk', 'test@gov.police.uk', 'test@GOV.PoliCe.uk', - 'test@valtech.co.uk', - 'test@cgi.com', 'test@ucds.email', 'test@naturalengland.org.uk', ])