darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-20 22:40:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

ensure invited user permissions show up correctly

Browse Source
This commit is contained in:
Leo Hemsted
2018-03-01 16:59:01 +00:00
parent 7f268c0ab3
commit 793d79c242
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/notify_client/models.py
View File

@@ -183,6 +183,7 @@ class InvitedUser(object):
self.status = status
self.created_at = created_at
self.auth_type = auth_type
self.permissions = translate_permissions_from_db_to_admin_roles(self.permissions)
def has_permissions(self, *permissions):
if self.status == 'cancelled':
@@ -217,7 +218,7 @@ class InvitedUser(object):
if permissions_as_string:
data['permissions'] = ','.join(self.permissions)
else:
data['permissions'] = self.permissions
data['permissions'] = sorted(self.permissions)
return data

3
app/notify_client/user_api_client.py
View File

@@ -148,8 +148,7 @@ class UserApiClient(NotifyAdminAPIClient):
# permissions passed in are the combined admin roles, not db permissions
endpoint = '/service/{}/users/{}'.format(service_id, user_id)
data = [{'permission': x} for x in translate_permissions_from_admin_roles_to_db(permissions)]
resp = self.post(endpoint, data=data)
return User(resp['data'], max_failed_login_count=self.max_failed_login_count)
self.post(endpoint, data=data)
def add_user_to_organisation(self, org_id, user_id):
resp = self.post('/organisations/{}/users/{}'.format(org_id, user_id), data={})