Merge branch 'master' into forgot-password

Conflicts:
	app/main/views/two_factor.py

app/notify_client/api_client.py

@@ -68,7 +68,7 @@ class NotificationsAdminAPIClient(NotificationsAPIClient):
             "users": users
         }
         endpoint = "/service/{0}".format(service_id)
-        return self.put(endpoint, data)
+        return self.post(endpoint, data)
 
     def create_service_template(self, name, type_, content, service_id, subject=None):
         """

app/notify_client/invite_api_client.py

@@ -31,7 +31,7 @@ class InviteApiClient(BaseAPIClient):
         invited_users = self._get_invited_users(invites)
         return invited_users
 
-    def accept_invite(self, token):
+    def check_token(self, token):
         resp = self.get(url='/invite/{}'.format(token))
         return InvitedUser(**resp['data'])
 
@@ -40,6 +40,11 @@ class InviteApiClient(BaseAPIClient):
         self.post(url='/service/{0}/invite/{1}'.format(service_id, invited_user_id),
                   data=data)
 
+    def accept_invite(self, service_id, invited_user_id):
+        data = {'status': 'accepted'}
+        self.post(url='/service/{0}/invite/{1}'.format(service_id, invited_user_id),
+                  data=data)
+
     def _get_invited_users(self, invites):
         invited_users = []
         for invite in invites:

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, invited_user):
+    def add_user_to_service(self, service_id, user_id, permissions):
         endpoint = '/service/{}/users/{}'.format(service_id, user_id)
-        resp = self.post(endpoint, data=invited_user.serialize(permissions_as_string=True))
+        resp = self.post(endpoint, data={'permissions': permissions})
         return User(resp['data'], max_failed_login_count=self.max_failed_login_count)
 
     def set_user_permissions(self, user_id, service_id, permissions):