Make user API client return JSON, not a model

The data flow of other bits of our application looks like this:
```
                         API (returns JSON)
                                  ⬇
          API client (returns a built in type, usually `dict`)
                                  ⬇
          Model (returns an instance, eg of type `Service`)
                                  ⬇
                         View (returns HTML)
```
The user API client was architected weirdly, in that it returned a model
directly, like this:

```
                         API (returns JSON)
                                  ⬇
    API client (returns a model, of type `User`, `InvitedUser`, etc)
                                  ⬇
                         View (returns HTML)
```

This mixing of different layers of the application is bad because it
makes it hard to write model code that doesn’t have circular
dependencies. As our application gets more complicated we will be
relying more on models to manage this complexity, so we should make it
easy, not hard to write them.

It also means that most of our mocking was of the User model, not just
the underlying JSON. So it would have been easy to introduce subtle bugs
to the user model, because it wasn’t being comprehensively tested. A lot
of the changed lines of code in this commit mean changing the tests to
mock only the JSON, which means that the model layer gets implicitly
tested.

For those reasons this commit changes the user API client to return
JSON, not an instance of `User` or other models.

app/main/views/verify.py

@@ -9,14 +9,13 @@ from flask import (
     session,
     url_for,
 )
-from flask_login import login_user
 from itsdangerous import SignatureExpired
 from notifications_utils.url_safe_token import check_token
 
 from app import user_api_client
 from app.main import main
 from app.main.forms import TwoFactorForm
-from app.models.user import InvitedUser
+from app.models.user import InvitedUser, User
 from app.utils import redirect_to_sign_in
 
 
@@ -54,7 +53,7 @@ def verify_email(token):
 
     # token contains json blob of format: {'user_id': '...', 'secret_code': '...'} (secret_code is unused)
     token_data = json.loads(token_data)
-    user = user_api_client.get_user(token_data['user_id'])
+    user = User.from_id(token_data['user_id'])
     if not user:
         abort(404)
 
@@ -63,17 +62,17 @@ def verify_email(token):
         return redirect(url_for('main.sign_in'))
 
     session['user_details'] = {"email": user.email_address, "id": user.id}
-    user_api_client.send_verify_code(user.id, 'sms', user.mobile_number)
+    user.send_verify_code()
     return redirect(url_for('main.verify'))
 
 
 def activate_user(user_id):
-    user = user_api_client.get_user(user_id)
+    user = User.from_id(user_id)
     # the user will have a new current_session_id set by the API - store it in the cookie for future requests
     session['current_session_id'] = user.current_session_id
     organisation_id = session.get('organisation_id')
-    activated_user = user_api_client.activate_user(user)
-    login_user(activated_user)
+    activated_user = user.activate()
+    activated_user.login()
 
     invited_user = session.get('invited_user')
     if invited_user:
@@ -92,7 +91,7 @@ def activate_user(user_id):
 
 def _add_invited_user_to_service(invited_user):
     invitation = InvitedUser(**invited_user)
-    user = user_api_client.get_user(session['user_id'])
+    user = User.from_id(session['user_id'])
     service_id = invited_user['service']
     user_api_client.add_user_to_service(service_id, user.id, invitation.permissions, invitation.folder_permissions)
     return service_id