Skip to content
Snippets Groups Projects
Commit b7626b57 authored by Jean-Philippe Laverdure's avatar Jean-Philippe Laverdure
Browse files

Merge branch 'master' into dev

parents 55e539d8 0b224be1
No related branches found
No related tags found
No related merge requests found
......@@ -304,5 +304,9 @@ if not DEBUG:
'django.request': {
'handlers': ['applogfile'],
'level': os.getenv('DJANGO_LOG_LEVEL', 'WARNING'),
}
},
'debug': {
'handlers': ['applogfile'],
'level': os.getenv('DJANGO_LOG_LEVEL', 'ERROR'),
},
})
......@@ -41,9 +41,10 @@ def user_login(sender, user, **kwargs):
if hasattr(user, 'ldapuser'):
user.profile.labs.add(*Lab.objects.filter(ldap__in=user.ldap_user.group_names))
elif azuread_groups:
user.profile.labs.add(*Lab.objects.filter(ldap__in=azuread_groups))
logger.info(f"Received groups: {azuread_groups}")
if settings.AUTH_LDAP_STAFF_GROUP in azuread_groups:
user.is_staff = True
else:
......
......@@ -12,7 +12,7 @@ class LoginSuccess(View):
if self.request.user.is_staff:
# user is an admin
request.session['active_lab_id'] = Lab.objects.get(ldap=settings.AUTH_LDAP_STAFF_GROUP.split(',')[0][3:]).id
request.session['active_lab_id'] = Lab.objects.get(ldap=settings.AUTH_LDAP_STAFF_GROUP).id
# return redirect('admin.dashboard')
elif self.request.user.profile.is_pi:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment