From 8819bbec6e5557bbe49a36e9e823694705c52ab5 Mon Sep 17 00:00:00 2001 From: Lance Bragstad Date: Mon, 22 Oct 2018 20:04:32 +0000 Subject: [PATCH] Use request_body_json function Since the credential API and trust API were one of the first APIs converted to flask, there weren't using a utility method to parse JSON out of request bodies. This commit makes both APIs re-use common code to get request bodies. Change-Id: Ic67fb1bc45018cdc6c3598adbc43cfc57f8592ab --- keystone/api/credentials.py | 4 ++-- keystone/api/trusts.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/keystone/api/credentials.py b/keystone/api/credentials.py index f258e19de4..9487f19145 100644 --- a/keystone/api/credentials.py +++ b/keystone/api/credentials.py @@ -129,7 +129,7 @@ class CredentialResource(ks_flask.ResourceBase): def post(self): # Create a new credential - credential = flask.request.json.get('credential', {}) + credential = self.request_body_json.get('credential', {}) target = {} target['credential'] = credential ENFORCER.enforce_call( @@ -150,7 +150,7 @@ class CredentialResource(ks_flask.ResourceBase): ) PROVIDERS.credential_api.get_credential(credential_id) - credential = flask.request.json.get('credential', {}) + credential = self.request_body_json.get('credential', {}) validation.lazy_validate(schema.credential_update, credential) self._require_matching_id(credential) ref = PROVIDERS.credential_api.update_credential( diff --git a/keystone/api/trusts.py b/keystone/api/trusts.py index cfaf1d51c6..067d39d166 100644 --- a/keystone/api/trusts.py +++ b/keystone/api/trusts.py @@ -207,7 +207,7 @@ class TrustResource(ks_flask.ResourceBase): The User creating the trust must be the trustor. """ ENFORCER.enforce_call(action='identity:create_trust') - trust = flask.request.json.get('trust', {}) + trust = self.request_body_json.get('trust', {}) validation.lazy_validate(schema.trust_create, trust) self._check_unrestricted()