mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-08-18 13:39:41 -04:00
Validate recipients in send a one-off message
It would be annoying to get all the way to the end of the flow and get told that the phone number or email address you entered isn’t valid. So this commit reuses the existing WTForms objects that we have to do some extra validation on the first step in the send one-off message flow. It also accounts for international phone numbers, if the service is allowed to send them. It doesn’t reject other people’s phone numbers if your service is restricted, because I think it’s better to let users play with the feature – it’s good for learning.
This commit is contained in:
@@ -7,6 +7,7 @@ from notifications_utils.recipients import (
|
||||
validate_phone_number,
|
||||
InvalidPhoneError
|
||||
)
|
||||
from notifications_utils.columns import Columns
|
||||
from wtforms import (
|
||||
validators,
|
||||
StringField,
|
||||
@@ -102,11 +103,26 @@ class UKMobileNumber(TelField):
|
||||
raise ValidationError(str(e))
|
||||
|
||||
|
||||
def mobile_number():
|
||||
return UKMobileNumber('Mobile number',
|
||||
class InternationalPhoneNumber(TelField):
|
||||
def pre_validate(self, form):
|
||||
try:
|
||||
validate_phone_number(self.data, international=True)
|
||||
except InvalidPhoneError as e:
|
||||
raise ValidationError(str(e))
|
||||
|
||||
|
||||
def mobile_number(label='Mobile number'):
|
||||
return UKMobileNumber(label,
|
||||
validators=[DataRequired(message='Can’t be empty')])
|
||||
|
||||
|
||||
def international_phone_number(label='Mobile number'):
|
||||
return InternationalPhoneNumber(
|
||||
label,
|
||||
validators=[DataRequired(message='Can’t be empty')]
|
||||
)
|
||||
|
||||
|
||||
def password(label='Password'):
|
||||
return PasswordField(label,
|
||||
validators=[DataRequired(message='Can’t be empty'),
|
||||
@@ -633,15 +649,25 @@ class PlaceholderForm(Form):
|
||||
def get_placeholder_form_instance(
|
||||
placeholder_name,
|
||||
dict_to_populate_from,
|
||||
optional_placeholder=False
|
||||
optional_placeholder=False,
|
||||
allow_international_phone_numbers=False,
|
||||
):
|
||||
|
||||
PlaceholderForm.placeholder_value = StringField(
|
||||
placeholder_name,
|
||||
validators=[
|
||||
if Columns.make_key(placeholder_name) == 'emailaddress':
|
||||
field = email_address(label=placeholder_name, gov_user=False)
|
||||
elif Columns.make_key(placeholder_name) == 'phonenumber':
|
||||
if allow_international_phone_numbers:
|
||||
field = international_phone_number(label=placeholder_name)
|
||||
else:
|
||||
field = mobile_number(label=placeholder_name)
|
||||
elif optional_placeholder:
|
||||
field = StringField(placeholder_name)
|
||||
else:
|
||||
field = StringField(placeholder_name, validators=[
|
||||
DataRequired(message='Can’t be empty')
|
||||
] if not optional_placeholder else []
|
||||
)
|
||||
])
|
||||
|
||||
PlaceholderForm.placeholder_value = field
|
||||
|
||||
return PlaceholderForm(
|
||||
placeholder_value=dict_to_populate_from.get(placeholder_name, '')
|
||||
|
||||
@@ -245,6 +245,7 @@ def send_test_step(service_id, template_id, step_index):
|
||||
current_placeholder,
|
||||
dict_to_populate_from=get_normalised_send_test_values_from_session(),
|
||||
optional_placeholder=optional_placeholder,
|
||||
allow_international_phone_numbers=current_service['can_send_international_sms'],
|
||||
)
|
||||
|
||||
if form.validate_on_submit():
|
||||
|
||||
Reference in New Issue
Block a user