Infra
/
lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into jwks_validation_error_control

This commit is contained in:
Hossein Shafagh 2019-05-07 13:09:02 -07:00 committed by GitHub
parent e58ff476c9 65f594fc29
commit b7ce9ab901
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lemur/auth/views.py
View File

@ -132,13 +132,16 @@ def create_user_roles(profile):
roles = [] roles = []
# update their google 'roles' # update their google 'roles'
for group in profile['googleGroups']: if 'googleGroups' in profile:
role = role_service.get_by_name(group) for group in profile['googleGroups']:
if not role: role = role_service.get_by_name(group)
role = role_service.create(group, description='This is a google group based role created by Lemur', third_party=True) if not role:
if not role.third_party: role = role_service.create(group, description='This is a google group based role created by Lemur', third_party=True)
role = role_service.set_third_party(role.id, third_party_status=True) if not role.third_party:
roles.append(role) role = role_service.set_third_party(role.id, third_party_status=True)
roles.append(role)
else:
current_app.logger.warning("'googleGroups' not sent by identity provider, no specific roles will assigned to the user.")
role = role_service.get_by_name(profile['email']) role = role_service.get_by_name(profile['email'])