Merge pull request #232 from alphagov/invite-permissions-status

[WIP] Add permissions to invited user

app/main/views/add_service.py

@@ -10,6 +10,8 @@ from flask_login import login_required
 from app.main import main
 from app.main.dao import services_dao, users_dao
 from app.main.forms import AddServiceForm
+from app.notify_client.models import InvitedUser
+
 from app import user_api_client
 
 
@@ -19,10 +21,11 @@ def add_service():
 
     invited_user = session.get('invited_user')
     if invited_user:
+        invitation = InvitedUser(**invited_user)
         # if invited user add to service and redirect to dashboard
         user = users_dao.get_user_by_id(session['user_id'])
         service_id = invited_user['service']
-        user_api_client.add_user_to_service(service_id, user.id)
+        user_api_client.add_user_to_service(service_id, user.id, invitation)
         session.pop('invited_user', None)
         return redirect(url_for('main.service_dashboard', service_id=service_id))
 

app/main/views/invites.py

@@ -1,12 +1,9 @@
 from flask import (
     redirect,
     url_for,
-    abort,
     session
 )
 
-from notifications_python_client.errors import HTTPError
-
 from app.main import main
 from app import (
     invite_api_client,
@@ -17,20 +14,14 @@ from app import (
 @main.route("/invitation/<token>")
 def accept_invite(token):
 
-    try:
-        invited_user = invite_api_client.accept_invite(token)
-        existing_user = user_api_client.get_user_by_email(invited_user.email_address)
+    invited_user = invite_api_client.accept_invite(token)
+    existing_user = user_api_client.get_user_by_email(invited_user.email_address)
 
-        if existing_user:
-            user_api_client.add_user_to_service(invited_user.service,
-                                                existing_user.id)
-            return redirect(url_for('main.service_dashboard', service_id=invited_user.service))
-        else:
-            session['invited_user'] = invited_user.serialize()
-            return redirect(url_for('main.register_from_invite'))
-
-    except HTTPError as e:
-        if e.status_code == 404:
-            abort(404)
-        else:
-            raise e
+    if existing_user:
+        user_api_client.add_user_to_service(invited_user.service,
+                                            existing_user.id,
+                                            invited_user)
+        return redirect(url_for('main.service_dashboard', service_id=invited_user.service))
+    else:
+        session['invited_user'] = invited_user.serialize()
+        return redirect(url_for('main.register_from_invite'))

app/notify_client/models.py

@@ -126,18 +126,37 @@ class InvitedUser(object):
         self.service = str(service)
         self.from_user = from_user
         self.email_address = email_address
-        self.permissions = permissions.split(',')
+        if isinstance(permissions, list):
+            self.permissions = permissions
+        else:
+            self.permissions = permissions.split(',')
         self.status = status
         self.created_at = created_at
 
     def has_permissions(self, permission):
         return permission in self.permissions
 
-    def serialize(self):
-        return {'id': self.id,
+    def __eq__(self, other):
+        return ((self.id,
+                self.service,
+                self.from_user,
+                self.email_address,
+                self.status) == (other.id,
+                other.service,
+                other.from_user,
+                other.email_address,
+                other.status))
+
+    def serialize(self, permissions_as_string=False):
+        data = {'id': self.id,
                 'service': self.service,
                 'from_user': self.from_user,
                 'email_address': self.email_address,
-                'permissions': self.permissions,
-                'status': self.status
+                'status': self.status,
+                'created_at': str(self.created_at)
                 }
+        if permissions_as_string:
+            data['permissions'] = ','.join(self.permissions)
+        else:
+            data['permissions'] = self.permissions
+        return data

app/notify_client/user_api_client.py

@@ -94,9 +94,9 @@ class UserApiClient(BaseAPIClient):
         resp = self.get(endpoint)
         return [User(data) for data in resp['data']]
 
-    def add_user_to_service(self, service_id, user_id):
+    def add_user_to_service(self, service_id, user_id, invited_user):
         endpoint = '/service/{}/users/{}'.format(service_id, user_id)
-        resp = self.post(endpoint, data={})
+        resp = self.post(endpoint, data=invited_user.serialize(permissions_as_string=True))
         return User(resp['data'], max_failed_login_count=self.max_failed_login_count)
 
     def set_user_permissions(self, user_id, service_id, permissions):