openstack
/
keystone
Code Issues Proposed changes

Merge "Optimize remove unused variable"

This commit is contained in:
Jenkins 2016-10-17 16:54:14 +00:00 committed by Gerrit Code Review
parent e1a14ad1a9 8789949181
commit 9455d17ff8
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
keystone/auth/plugins/mapped.py
View File

@ -56,12 +56,10 @@ class Mapped(base.AuthMethodHandler):
if 'id' in auth_payload:
token_ref = self._get_token_ref(auth_payload)
handle_scoped_token(request,
auth_payload,
auth_context,
token_ref,
self.federation_api,
self.identity_api,
self.token_provider_api)
self.identity_api)
else:
handle_unscoped_token(request,
auth_payload,
@ -71,8 +69,8 @@ class Mapped(base.AuthMethodHandler):
self.identity_api)
def handle_scoped_token(request, auth_payload, auth_context, token_ref,
federation_api, identity_api, token_provider_api):
def handle_scoped_token(request, auth_context, token_ref,
federation_api, identity_api):
utils.validate_expiration(token_ref)
token_audit_id = token_ref.audit_id
identity_provider = token_ref.federation_idp_id

9
keystone/auth/plugins/token.py
View File

@ -46,14 +46,13 @@ class Token(base.AuthMethodHandler):
token_ref = self._get_token_ref(auth_payload)
if token_ref.is_federated_user and self.federation_api:
mapped.handle_scoped_token(
request, auth_payload, user_context, token_ref,
self.federation_api, self.identity_api,
self.token_provider_api)
request, user_context, token_ref,
self.federation_api, self.identity_api)
else:
token_authenticate(request, auth_payload, user_context, token_ref)
token_authenticate(request, user_context, token_ref)
def token_authenticate(request, auth_payload, user_context, token_ref):
def token_authenticate(request, user_context, token_ref):
try:
# Do not allow tokens used for delegation to