diff options
| author | Brian Lamar <brian.lamar@rackspace.com> | 2012-03-14 18:30:13 -0400 |
|---|---|---|
| committer | Brian Lamar <brian.lamar@rackspace.com> | 2012-03-14 18:30:16 -0400 |
| commit | ab6be05068068b0902db44b1d60f56eea4fe1215 (patch) | |
| tree | cbe3e67a8d0e83207257f434e1d35c8eabfdd723 | |
| parent | 9a2010bfe81a386610a294d0b29c31e12db79773 (diff) | |
Update username -> name in token response.
Tokens validation responses contain user information. The API docs
seem to indicate token["user"]["name"] contains the username but
currently the auth_token.py middleware checks for
token["user"]["username"]. This updates that check and the tests.
Fixes bug 955563
Change-Id: Ib2fbf6fcea87f7066394cf14c18158f1e5eeaf06
| -rw-r--r-- | keystone/middleware/auth_token.py | 2 | ||||
| -rw-r--r-- | tests/test_auth_token_middleware.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/keystone/middleware/auth_token.py b/keystone/middleware/auth_token.py index 76b20b36..e89c1a76 100644 --- a/keystone/middleware/auth_token.py +++ b/keystone/middleware/auth_token.py @@ -416,7 +416,7 @@ class AuthProtocol(object): tenant_id, tenant_name = get_tenant_info() user_id = user['id'] - user_name = user['username'] + user_name = user['name'] return { 'X-Identity-Status': 'Confirmed', diff --git a/tests/test_auth_token_middleware.py b/tests/test_auth_token_middleware.py index 9f7934a9..b966d833 100644 --- a/tests/test_auth_token_middleware.py +++ b/tests/test_auth_token_middleware.py @@ -37,7 +37,7 @@ TOKEN_RESPONSES = { }, 'user': { 'id': 'user_id1', - 'username': 'user_name1', + 'name': 'user_name1', 'roles': [ {'name': 'role1'}, {'name': 'role2'}, @@ -52,7 +52,7 @@ TOKEN_RESPONSES = { }, 'user': { 'id': 'user_id1', - 'username': 'user_name1', + 'name': 'user_name1', 'tenantId': 'tenant_id1', 'tenantName': 'tenant_name1', 'roles': [ @@ -70,7 +70,7 @@ TOKEN_RESPONSES = { }, 'user': { 'id': 'user_id1', - 'username': 'user_name1', + 'name': 'user_name1', 'roles': [ {'name': 'role1'}, {'name': 'role2'}, @@ -85,7 +85,7 @@ TOKEN_RESPONSES = { }, 'user': { 'id': 'user_id1', - 'username': 'user_name1', + 'name': 'user_name1', 'roles': [ {'name': 'role1'}, {'name': 'role2'}, |