summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkihiro Motoki <motoki@da.jp.nec.com>2014-08-31 07:18:20 +0900
committerAkihiro Motoki <motoki@da.jp.nec.com>2014-08-31 07:36:39 +0900
commit5c8b0c78f28a9fdc8eea91bc0d89879523dd1959 (patch)
tree043d9608e78eae819d055e59142aa7a55af076a8
parent0a0db68468a5a9a56c0f57b9b96eaa008b4b0d10 (diff)
downloaddjango_openstack_auth-5c8b0c78f28a9fdc8eea91bc0d89879523dd1959.tar.gz
Consider old version of token without 'user_domain_name' attr
Closes-Bug: #1363515 Change-Id: I252b99fba3c48a7ed27af1b7da3b1cb037555eb8
-rw-r--r--openstack_auth/user.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/openstack_auth/user.py b/openstack_auth/user.py
index 01e204b..0fb368b 100644
--- a/openstack_auth/user.py
+++ b/openstack_auth/user.py
@@ -40,7 +40,9 @@ def create_user_from_token(request, token, endpoint, services_region=None):
token=token,
user=token.user['name'],
user_domain_id=token.user_domain_id,
- user_domain_name=token.user_domain_name,
+ # We need to consider already logged-in users with an old
+ # version of Token without user_domain_name.
+ user_domain_name=getattr(token, 'user_domain_name', None),
project_id=token.project['id'],
project_name=token.project['name'],
domain_id=token.domain['id'],