openstack/keystone
Code Issues Proposed changes

Merge "Fix the wrong check condition"

Browse Source
This commit is contained in:
Jenkins 2016-07-18 13:38:30 +00:00 committed by Gerrit Code Review
commit df30ac6efc
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
keystone/models/revoke_model.py
View File

@ -111,7 +111,7 @@ class RevokeEvent(object):
event['OS-TRUST:trust_id'] = self.trust_id event['OS-TRUST:trust_id'] = self.trust_id
if self.consumer_id is not None: if self.consumer_id is not None:
event['OS-OAUTH1:consumer_id'] = self.consumer_id event['OS-OAUTH1:consumer_id'] = self.consumer_id
if self.consumer_id is not None: if self.access_token_id is not None:
event['OS-OAUTH1:access_token_id'] = self.access_token_id event['OS-OAUTH1:access_token_id'] = self.access_token_id
if self.expires_at is not None: if self.expires_at is not None:
event['expires_at'] = utils.isotime(self.expires_at) event['expires_at'] = utils.isotime(self.expires_at)

15
keystone/tests/unit/test_v3_os_revoke.py
View File

@ -145,3 +145,18 @@ class OSRevokeTests(test_v3.RestfulTestCase, test_v3.JsonHomeTestMixin):
# Strip off the microseconds from `revoked_at`. # Strip off the microseconds from `revoked_at`.
self.assertTimestampEqual(utils.isotime(revoked_at), self.assertTimestampEqual(utils.isotime(revoked_at),
events[0]['revoked_at']) events[0]['revoked_at'])
def test_access_token_id_not_in_event(self):
ref = {'description': uuid.uuid4().hex}
resp = self.post('/OS-OAUTH1/consumers', body={'consumer': ref})
consumer_id = resp.result['consumer']['id']
self.oauth_api.delete_consumer(consumer_id)
resp = self.get('/OS-REVOKE/events')
events = resp.json_body['events']
self.assertThat(events, matchers.HasLength(1))
event = events[0]
self.assertEqual(consumer_id, event['OS-OAUTH1:consumer_id'])
# `OS-OAUTH1:access_token_id` is None and won't be returned to
# end user.
self.assertNotIn('OS-OAUTH1:access_token_id', event)