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

service_keys: s/get_keys/list_keys

Browse source
This commit is contained in:
Jimmy Zelinskie 2016-03-30 13:20:35 -04:00 • committed by Jimmy Zelinskie
parent 0ec54fc70e
commit c6b8b3ce8c
3 changed files with 24 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
endpoints/api/superuser.py
View file

@ -514,7 +514,7 @@ class SuperUserServiceKeyManagement(ApiResource):
@require_scope(scopes.SUPERUSER)
def get(self):
if SuperUserPermission().can():
return jsonify(model.service_keys.get_keys())
return jsonify(model.service_keys.list_keys())
abort(403)
@verify_not_prod
@ -526,7 +526,9 @@ class SuperUserServiceKeyManagement(ApiResource):
body = request.get_json()
expiration_date = body.get('expiration', None)
if expiration_date is not None and expiration_date != '':
if expiration_date == '':
expiration_date = None
if expiration_date is not None:
try:
expiration_date = datetime.utcfromtimestamp(float(expiration_date))
except ValueError: