Make invited user model inherit from JSONModel

This is more consistent, and less fiddly that always having to call it
with a dictionary expansion.

tests/app/main/views/organisations/test_organisation_invites.py

@@ -231,7 +231,7 @@ def test_registration_from_org_invite_has_bad_data(
     data,
     error
 ):
-    invited_org_user = InvitedOrgUser(**sample_org_invite)
+    invited_org_user = InvitedOrgUser(sample_org_invite)
     with client.session_transaction() as session:
         session['invited_org_user'] = invited_org_user.serialize()
 
@@ -251,7 +251,7 @@ def test_registration_from_org_invite_has_different_email_or_organisation(
     sample_org_invite,
     diff_data
 ):
-    invited_org_user = InvitedOrgUser(**sample_org_invite)
+    invited_org_user = InvitedOrgUser(sample_org_invite)
     with client.session_transaction() as session:
         session['invited_org_user'] = invited_org_user.serialize()
 
@@ -278,7 +278,7 @@ def test_org_user_registers_with_email_already_in_use(
     mock_send_already_registered_email,
     mock_register_user
 ):
-    invited_org_user = InvitedOrgUser(**sample_org_invite)
+    invited_org_user = InvitedOrgUser(sample_org_invite)
     with client.session_transaction() as session:
         session['invited_org_user'] = invited_org_user.serialize()
 
@@ -311,7 +311,7 @@ def test_org_user_registration(
     mock_accept_org_invite,
     mock_add_user_to_organisation,
 ):
-    invited_org_user = InvitedOrgUser(**sample_org_invite)
+    invited_org_user = InvitedOrgUser(sample_org_invite)
     with client.session_transaction() as session:
         session['invited_org_user'] = invited_org_user.serialize()
 
@@ -349,7 +349,7 @@ def test_verified_org_user_redirects_to_dashboard(
     mock_activate_user,
     mock_login,
 ):
-    invited_org_user = InvitedOrgUser(**sample_org_invite).serialize()
+    invited_org_user = InvitedOrgUser(sample_org_invite).serialize()
     with client.session_transaction() as session:
         session['expiry_date'] = str(datetime.utcnow() + timedelta(hours=1))
         session['user_details'] = {"email": invited_org_user['email_address'], "id": invited_org_user['id']}

tests/app/main/views/test_register.py

@@ -199,14 +199,18 @@ def test_shows_registration_page_from_invite(
     expected_value,
 ):
     with client_request.session_transaction() as session:
-        session['invited_user'] = InvitedUser(
-            fake_uuid, fake_uuid, "",
-            email_address,
-            ["manage_users"],
-            "pending",
-            datetime.utcnow(),
-            'sms_auth', []
-        ).serialize()
+        session['invited_user'] = {
+            'id': fake_uuid,
+            'service': fake_uuid,
+            'from_user': "",
+            'email_address': email_address,
+            'permissions': ["manage_users"],
+            'status': "pending",
+            'created_at': datetime.utcnow(),
+            'auth_type': 'sms_auth',
+            'folder_permissions': [],
+        }
+
     page = client_request.get('main.register_from_invite')
     assert page.select_one('input[name=name]')['value'] == expected_value
 
@@ -219,13 +223,19 @@ def test_register_from_invite(
     mock_send_verify_code,
     mock_accept_invite,
 ):
-    invited_user = InvitedUser(fake_uuid, fake_uuid, "",
-                               "invited@user.com",
-                               ["manage_users"],
-                               "pending",
-                               datetime.utcnow(),
-                               'sms_auth',
-                               [])
+    invited_user = InvitedUser(
+        {
+            'id': fake_uuid,
+            'service': fake_uuid,
+            'from_user': "",
+            'email_address': "invited@user.com",
+            'permissions': ["manage_users"],
+            'status': "pending",
+            'created_at': datetime.utcnow(),
+            'auth_type': 'sms_auth',
+            'folder_permissions': [],
+        }
+    )
     with client.session_transaction() as session:
         session['invited_user'] = invited_user.serialize()
     response = client.post(
@@ -256,13 +266,19 @@ def test_register_from_invite_when_user_registers_in_another_browser(
     mock_get_user_by_email,
     mock_accept_invite,
 ):
-    invited_user = InvitedUser(api_user_active['id'], api_user_active['id'], "",
-                               api_user_active['email_address'],
-                               ["manage_users"],
-                               "pending",
-                               datetime.utcnow(),
-                               'sms_auth',
-                               [])
+    invited_user = InvitedUser(
+        {
+            'id': api_user_active['id'],
+            'service': api_user_active['id'],
+            'from_user': "",
+            'email_address': api_user_active['email_address'],
+            'permissions': ["manage_users"],
+            'status': "pending",
+            'created_at': datetime.utcnow(),
+            'auth_type': 'sms_auth',
+            'folder_permissions': [],
+        }
+    )
     with client.session_transaction() as session:
         session['invited_user'] = invited_user.serialize()
     response = client.post(

tests/app/main/views/test_sign_in.py

@@ -45,7 +45,7 @@ def test_doesnt_redirect_to_sign_in_if_no_session_info(
     api_user_active,
     mock_get_organisation_by_domain,
 ):
-    assert 'current_session_id' not in api_user_active
+    api_user_active['current_session_id'] = str(uuid.UUID(int=1))
 
     with client_request.session_transaction() as session:
         session['current_session_id'] = None