diff options
Diffstat (limited to 'keystone')
| -rw-r--r-- | keystone/common/wsgi.py | 3 | ||||
| -rw-r--r-- | keystone/contrib/ec2/core.py | 4 | ||||
| -rw-r--r-- | keystone/token/controllers.py | 10 | ||||
| -rw-r--r-- | keystone/token/providers/uuid.py | 4 |
4 files changed, 8 insertions, 13 deletions
diff --git a/keystone/common/wsgi.py b/keystone/common/wsgi.py index c7e30576..fbc63385 100644 --- a/keystone/common/wsgi.py +++ b/keystone/common/wsgi.py @@ -283,8 +283,7 @@ class Application(BaseApplication): def assert_admin(self, context): if not context['is_admin']: try: - user_token_ref = self.token_api.get_token( - token_id=context['token_id']) + user_token_ref = self.token_api.get_token(context['token_id']) except exception.TokenNotFound as e: raise exception.Unauthorized(e) diff --git a/keystone/contrib/ec2/core.py b/keystone/contrib/ec2/core.py index adba7e74..8f72e431 100644 --- a/keystone/contrib/ec2/core.py +++ b/keystone/contrib/ec2/core.py @@ -188,9 +188,7 @@ class Ec2Controller(controller.V2Controller): for role_id in roles] catalog_ref = self.catalog_api.get_catalog( - user_id=user_ref['id'], - tenant_id=tenant_ref['id'], - metadata=metadata_ref) + user_ref['id'], tenant_ref['id'], metadata_ref) auth_token_data = dict(user=user_ref, tenant=tenant_ref, diff --git a/keystone/token/controllers.py b/keystone/token/controllers.py index d2b7d9fd..9ebc29fe 100644 --- a/keystone/token/controllers.py +++ b/keystone/token/controllers.py @@ -91,9 +91,7 @@ class Auth(controller.V2Controller): if tenant_ref: catalog_ref = self.catalog_api.get_catalog( - user_id=user_ref['id'], - tenant_id=tenant_ref['id'], - metadata=metadata_ref) + user_ref['id'], tenant_ref['id'], metadata_ref) else: catalog_ref = {} @@ -457,9 +455,9 @@ class Auth(controller.V2Controller): catalog_ref = None if token_ref.get('tenant'): catalog_ref = self.catalog_api.get_catalog( - user_id=token_ref['user']['id'], - tenant_id=token_ref['tenant']['id'], - metadata=token_ref['metadata']) + token_ref['user']['id'], + token_ref['tenant']['id'], + token_ref['metadata']) return Auth.format_endpoint_list(catalog_ref) diff --git a/keystone/token/providers/uuid.py b/keystone/token/providers/uuid.py index 94896920..acfa9372 100644 --- a/keystone/token/providers/uuid.py +++ b/keystone/token/providers/uuid.py @@ -438,7 +438,7 @@ class Provider(token.provider.Provider): def _verify_token(self, token_id, belongs_to=None): """Verify the given token and return the token_ref.""" - token_ref = self.token_api.get_token(token_id=token_id) + token_ref = self.token_api.get_token(token_id) assert token_ref if belongs_to: assert (token_ref['tenant'] and @@ -518,7 +518,7 @@ class Provider(token.provider.Provider): catalog_ref = self.catalog_api.get_catalog( token_ref['user']['id'], token_ref['tenant']['id'], - metadata=metadata_ref) + metadata_ref) token_data = self.v2_token_data_helper.get_token_data( token_ref=token_ref, roles_ref=role_refs, |