Merge "Set default value for new token attributes" into stable/kilo

1 files changed, 3 insertions, 2 deletions

diff --git a/openstack_auth/user.py b/openstack_auth/user.py
index 811fe84..132e37b 100644
--- a/openstack_auth/user.py
+++ b/openstack_auth/user.py
@@ -55,8 +55,9 @@ def create_user_from_token(request, token, endpoint, services_region=None):
                 roles=token.roles,
                 endpoint=endpoint,
                 services_region=svc_region,
-                is_federated=token.is_federated,
-                unscoped_token=token.unscoped_token)
+                is_federated=getattr(token, 'is_federated', False),
+                unscoped_token=getattr(token, 'unscoped_token',
+                                       request.session.get('unscoped_token')))
 
 
 class Token(object):