Merge "Return role names by AccessInfo.role_names"
This commit is contained in:
commit
d5a140e092
|
@ -163,6 +163,15 @@ class AccessInfo(dict):
|
||||||
"""
|
"""
|
||||||
raise NotImplementedError()
|
raise NotImplementedError()
|
||||||
|
|
||||||
|
@property
|
||||||
|
def role_names(self):
|
||||||
|
"""Returns a list of role names of the user associated with the
|
||||||
|
authentication request.
|
||||||
|
|
||||||
|
:returns: a list of strings of role names
|
||||||
|
"""
|
||||||
|
raise NotImplementedError()
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def domain_name(self):
|
def domain_name(self):
|
||||||
"""Returns the domain name associated with the authentication token.
|
"""Returns the domain name associated with the authentication token.
|
||||||
|
@ -361,6 +370,10 @@ class AccessInfoV2(AccessInfo):
|
||||||
def user_domain_name(self):
|
def user_domain_name(self):
|
||||||
return 'Default'
|
return 'Default'
|
||||||
|
|
||||||
|
@property
|
||||||
|
def role_names(self):
|
||||||
|
return [r['name'] for r in self['user']['roles']]
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def domain_name(self):
|
def domain_name(self):
|
||||||
return None
|
return None
|
||||||
|
@ -515,6 +528,10 @@ class AccessInfoV3(AccessInfo):
|
||||||
def user_domain_name(self):
|
def user_domain_name(self):
|
||||||
return self['user']['domain']['name']
|
return self['user']['domain']['name']
|
||||||
|
|
||||||
|
@property
|
||||||
|
def role_names(self):
|
||||||
|
return [r['name'] for r in self['user'].get('roles', [])]
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def username(self):
|
def username(self):
|
||||||
return self['user']['name']
|
return self['user']['name']
|
||||||
|
|
Loading…
Reference in New Issue