vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add filter for disabled users to superuser user list API

Browse source 
Fixes https://jira.coreos.com/browse/QS-102
This commit is contained in:
Joseph Schorr 2017-12-22 16:45:49 -05:00
parent 1d3a93efcb
commit 8e473b9779
6 changed files with 44 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

9
endpoints/api/superuser.py
View file

@ -21,7 +21,7 @@ from data.database import ServiceKeyApprovalType
from endpoints.api import (ApiResource, nickname, resource, validate_json_request,
internal_only, require_scope, show_if, parse_args,
query_param, abort, require_fresh_login, path_param, verify_not_prod,
page_support, log_action, InvalidRequest, format_date)
page_support, log_action, InvalidRequest, format_date, truthy_bool)
from endpoints.api.build import get_logs_or_log_url
from endpoints.api.superuser_models_pre_oci import (pre_oci_model, ServiceKeyDoesNotExist,
ServiceKeyAlreadyApproved,
@ -275,11 +275,14 @@ class SuperUserList(ApiResource):
@require_fresh_login
@verify_not_prod
@nickname('listAllUsers')
@parse_args()
@query_param('disabled', 'If false, only enabled users will be returned.', type=truthy_bool,
default=True)
@require_scope(scopes.SUPERUSER)
def get(self):
def get(self, parsed_args):
""" Returns a list of all users in the system. """
if SuperUserPermission().can():
users = pre_oci_model.get_active_users()
users = pre_oci_model.get_active_users(disabled=parsed_args['disabled'])
return {
'users': [user.to_dict() for user in users]
}