Email auth for inviting members and editing permissions

app/notify_client/invite_api_client.py

@@ -12,12 +12,13 @@ class InviteApiClient(NotifyAdminAPIClient):
         self.service_id = app.config['ADMIN_CLIENT_USER_NAME']
         self.api_key = app.config['ADMIN_CLIENT_SECRET']
 
-    def create_invite(self, invite_from_id, service_id, email_address, permissions):
+    def create_invite(self, invite_from_id, service_id, email_address, permissions, auth_type):
         data = {
             'service': str(service_id),
             'email_address': email_address,
             'from_user': invite_from_id,
-            'permissions': permissions
+            'permissions': permissions,
+            'auth_type': auth_type
         }
         data = _attach_current_user(data)
         resp = self.post(url='/service/{}/invite'.format(service_id), data=data)

app/notify_client/models.py

@@ -10,6 +10,7 @@ class User(UserMixin):
         self._mobile_number = fields.get('mobile_number')
         self._password_changed_at = fields.get('password_changed_at')
         self._permissions = fields.get('permissions')
+        self._auth_type = fields.get('auth_type')
         self._failed_login_count = fields.get('failed_login_count')
         self._state = fields.get('state')
         self.max_failed_login_count = max_failed_login_count
@@ -108,6 +109,14 @@ class User(UserMixin):
             return set(self._permissions[service_id]) >= set(permissions)
         return False
 
+    @property
+    def auth_type(self):
+        return self._auth_type
+
+    @auth_type.setter
+    def auth_type(self, auth_type):
+        self._auth_type = auth_type
+
     @property
     def failed_login_count(self):
         return self._failed_login_count
@@ -155,6 +164,7 @@ class InvitedUser(object):
                 self.permissions = []
         self.status = status
         self.created_at = created_at
+        self.auth_type = auth_type
 
     def has_permissions(self, permissions):
         return set(self.permissions) > set(permissions)
@@ -164,10 +174,12 @@ class InvitedUser(object):
                 self.service,
                 self.from_user,
                 self.email_address,
+                self.auth_type,
                 self.status) == (other.id,
                 other.service,
                 other.from_user,
                 other.email_address,
+                other.auth_type,
                 other.status))
 
     def serialize(self, permissions_as_string=False):
@@ -176,7 +188,8 @@ class InvitedUser(object):
                 'from_user': self.from_user,
                 'email_address': self.email_address,
                 'status': self.status,
-                'created_at': str(self.created_at)
+                'created_at': str(self.created_at),
+                'auth_type': self.auth_type
                 }
         if permissions_as_string:
             data['permissions'] = ','.join(self.permissions)

app/notify_client/user_api_client.py

@@ -6,7 +6,8 @@ from app.notify_client.models import User
 ALLOWED_ATTRIBUTES = {
     'name',
     'email_address',
-    'mobile_number'
+    'mobile_number',
+    'auth_type',
 }