Merge with master.

app/main/views/dashboard.py

@@ -19,6 +19,6 @@ def service_dashboard(service_id):
     return render_template(
         'views/service_dashboard.html',
         jobs=jobs,
-        free_text_messages_remaining=560,
+        free_text_messages_remaining='25,000',
         spent_this_month='0.00',
         service_id=service_id)

app/main/views/jobs.py

@@ -50,7 +50,7 @@ messages = [
 def view_jobs(service_id):
     return render_template(
         'views/jobs.html',
-        jobs=jobs,
+        jobs=[],  # use `jobs` for placeholder data
         service_id=service_id
     )
 

app/main/views/register.py

@@ -1,12 +1,21 @@
 from datetime import datetime, timedelta
 
-from flask import render_template, redirect, session
+from flask import (
+    render_template,
+    redirect,
+    session,
+    current_app,
+    abort
+)
+
+from client.errors import HTTPError
 
 from app.main import main
+from app.models import User
 from app.main.dao import users_dao
 from app.main.forms import RegisterUserForm
-from app.models import User
 
+from app.notify_client.user_api_client import UserApiClient
 
 # TODO how do we handle duplicate unverifed email addresses?
 # malicious or otherwise.
@@ -18,6 +27,8 @@ def register():
     form = RegisterUserForm(users_dao.get_user_by_email)
 
     if form.validate_on_submit():
+
+        #  TODO remove once all api integrations done
         user = User(name=form.name.data,
                     email_address=form.email_address.data,
                     mobile_number=form.mobile_number.data,
@@ -25,6 +36,21 @@ def register():
                     created_at=datetime.now(),
                     role_id=1)
         users_dao.insert_user(user)
+
+        user_api_client = UserApiClient(current_app.config['NOTIFY_API_URL'],
+                                        current_app.config['ADMIN_CLIENT_USER_NAME'],
+                                        current_app.config['ADMIN_CLIENT_SECRET'])
+        try:
+            user_api_client.register_user(form.name.data,
+                                          form.email_address.data,
+                                          form.mobile_number.data,
+                                          form.password.data)
+        except HTTPError as e:
+            if e.status_code == 404:
+                abort(404)
+            else:
+                raise e
+
         # TODO possibly there should be some exception handling
         # for sending sms and email codes.
         # How do we report to the user there is a problem with