darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-20 14:29:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Updated to send email through the client send_email.

Browse Source
This commit is contained in:
Nicholas Staples
2016-01-20 14:45:50 +00:00
parent ae781bc58d
commit 75d7110642
6 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/main/forms.py
View File

@@ -63,7 +63,7 @@ class UKMobileNumber(StringField):
return return
# TODO implement in the render field method. # TODO implement in the render field method.
# API's require no spaces in the number # API's require no spaces in the number
#self.data = '+44 7{} {} {}'.format(*re.findall('...', self.data)) # self.data = '+44 7{} {} {}'.format(*re.findall('...', self.data))
self.data = '+447{}{}{}'.format(*re.findall('...', self.data)) self.data = '+447{}{}{}'.format(*re.findall('...', self.data))

5
app/notify_client/api_client.py
View File

@@ -128,8 +128,6 @@ class NotificationsAdminAPIClient(NotificationsAPIClient):
message, message,
job_id=None, job_id=None,
description=None): description=None):
print("{0} {1} {2} {3}".format(
mobile_number, message, job_id, description))
self.send_sms_notification(mobile_number, message) self.send_sms_notification(mobile_number, message)
def send_email(self, def send_email(self,
@@ -139,5 +137,4 @@ class NotificationsAdminAPIClient(NotificationsAPIClient):
subject, subject,
job_id=None, job_id=None,
description=None): description=None):
print("{0} {1} {2} {3} {4} {5}".format( self.send_email_notification(email_address, message, from_address, subject)
email_address, message, from_address, subject, job_id, description))

2
app/notify_client/user_api_client.py
View File

@@ -22,7 +22,7 @@ class UserApiClient(BaseAPIClient):
"password": password "password": password
} }
user_data = self.post("/user", data) user_data = self.post("/user", data)
return User(user_data, max_failed_login_count=self.user_max_failed_login_count) return User(user_data['data'], max_failed_login_count=self.user_max_failed_login_count)
class User(object): class User(object):

2
requirements.txt
View File

@@ -11,6 +11,6 @@ Flask-Bcrypt==0.6.2
credstash==1.8.0 credstash==1.8.0
boto3==1.2.3 boto3==1.2.3
git+https://github.com/alphagov/notifications-python-client.git@0.1.8#egg=notifications-python-client==0.1.8 git+https://github.com/alphagov/notifications-python-client.git@0.1.9#egg=notifications-python-client==0.1.9
git+https://github.com/alphagov/notifications-utils.git@0.0.3#egg=notifications-utils==0.0.3 git+https://github.com/alphagov/notifications-utils.git@0.0.3#egg=notifications-utils==0.0.3

2
tests/app/main/test_phone_number_form_field.py
View File

@@ -72,4 +72,4 @@ def test_phone_number_rejects_invalid_values(phone_number, error_message):
def test_phone_number_outputs_in_correct_format(phone_number): def test_phone_number_outputs_in_correct_format(phone_number):
form = FormExample(phone_number=phone_number) form = FormExample(phone_number=phone_number)
form.validate() form.validate()
assert form.phone_number.data == '+44 7123 456 789' assert form.phone_number.data == '+447123456789'

2
tests/app/main/views/test_code_not_received.py
View File

@@ -107,7 +107,7 @@ def test_should_update_mobile_number_resend_code(app_,
assert response.status_code == 302 assert response.status_code == 302
assert response.location == url_for('main.verify', _external=True) assert response.location == url_for('main.verify', _external=True)
updated_user = users_dao.get_user_by_id(user.id) updated_user = users_dao.get_user_by_id(user.id)
assert updated_user.mobile_number == '+44 7700 900 460' assert updated_user.mobile_number == '+447700900460'
def test_should_render_verification_code_not_received(app_, def test_should_render_verification_code_not_received(app_,