key server: misc fixes to make jwtproxy work

This commit is contained in:
Jimmy Zelinskie 2016-04-01 15:48:31 -04:00 committed by Jimmy Zelinskie
parent 5cdc7812dc
commit 885a41e6f5
3 changed files with 8 additions and 7 deletions

View file

@ -637,7 +637,6 @@ class SuperUserServiceKeyApproval(ApiResource):
@verify_not_prod
@nickname('approveServiceKey')
@require_scope(scopes.SUPERUSER)
@validate_json_request('ApproveServiceKey')
def put(self, kid):
if SuperUserPermission().can():
approver = get_authenticated_user()
@ -648,6 +647,6 @@ class SuperUserServiceKeyApproval(ApiResource):
except model.ServiceKeyAlreadyApproved:
pass
make_response('', 200)
return make_response('', 200)
abort(403)

View file

@ -83,6 +83,7 @@ def list_service_keys(service):
@key_server.route('/services/<service>/keys/<kid>', methods=['GET'])
def get_service_key(service, kid):
logger.debug(kid)
try:
key = data.model.service_keys.get_service_key(kid)
except data.model.ServiceKeyDoesNotExist: