diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-10-10 08:21:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-10-10 08:21:02 +0000 |
| commit | af25b2b6304448360a64a9ffe662e20493b77a48 (patch) | |
| tree | 59eac50f3b84a828b077901134668d9ecc922c07 | |
| parent | 9025b64a8f2bf5cf01a18453d6728e081bd2c3b9 (diff) | |
| parent | 062786bc53533edf78a24e35688d7183c0b57175 (diff) | |
| download | keystone-af25b2b6304448360a64a9ffe662e20493b77a48.tar.gz | |
Merge "Clean up federated identity audit code"
| -rw-r--r-- | keystone/auth/plugins/mapped.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/keystone/auth/plugins/mapped.py b/keystone/auth/plugins/mapped.py index a42112f11..91cd2d068 100644 --- a/keystone/auth/plugins/mapped.py +++ b/keystone/auth/plugins/mapped.py @@ -58,7 +58,7 @@ class Mapped(auth.AuthMethodHandler): token_audit_id = token_ref.audit_id identity_provider = token_ref.federation_idp_id protocol = token_ref.federation_protocol_id - user_id = token_ref['user']['id'] + user_id = token_ref.user_id group_ids = token_ref.federation_group_ids send_notification = functools.partial( notifications.send_saml_audit_notification, 'authenticate', @@ -92,8 +92,8 @@ class Mapped(auth.AuthMethodHandler): identity_provider = auth_payload['identity_provider'] protocol = auth_payload['protocol'] group_ids = None - # NOTE(topol): Since the user is coming in from an IdP with a SAML doc - # instead of from a token we set token_id to None + # NOTE(topol): The user is coming in from an IdP with a SAML assertion + # instead of from a token, so we set token_id to None token_id = None try: |