darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-02-05 10:53:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into forgot-password

Browse Source 
Conflicts:
	app/main/views/two_factor.py
This commit is contained in:
Rebecca Law
2016-03-08 15:03:25 +00:00
parent e735d772fe d3825b253a
commit 29ddad60e7
19 changed files with 293 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/notify_client/user_api_client.py
View File

@@ -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):