Updated to send email through the client send_email.

app/main/forms.py

@@ -63,7 +63,7 @@ class UKMobileNumber(StringField):
             return
         # TODO implement in the render field method.
         # 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))
 
 

app/notify_client/api_client.py

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

app/notify_client/user_api_client.py

@@ -22,7 +22,7 @@ class UserApiClient(BaseAPIClient):
             "password": password
         }
         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):

requirements.txt

@@ -11,6 +11,6 @@ Flask-Bcrypt==0.6.2
 credstash==1.8.0
 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

tests/app/main/test_phone_number_form_field.py

@@ -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):
     form = FormExample(phone_number=phone_number)
     form.validate()
-    assert form.phone_number.data == '+44 7123 456 789'
+    assert form.phone_number.data == '+447123456789'

tests/app/main/views/test_code_not_received.py

@@ -107,7 +107,7 @@ def test_should_update_mobile_number_resend_code(app_,
             assert response.status_code == 302
             assert response.location == url_for('main.verify', _external=True)
             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_,