External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 17:37:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10965 from tchellomello/fix_ldap_dn

Browse Source 
Associates ldap_dn on a first User() login
This commit is contained in:
Marcelo Moreira de Mello
2021-08-31 14:25:26 -04:00
committed by GitHub
parent 30cf483357 e23e634974
commit 9588ff3b4f
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
awx/sso/backends.py
View File

@@ -395,10 +395,17 @@ def on_populate_user(sender, **kwargs):
remove = bool(team_opts.get('remove', True)) remove = bool(team_opts.get('remove', True))
_update_m2m_from_groups(user, ldap_user, team.member_role.members, users_opts, remove) _update_m2m_from_groups(user, ldap_user, team.member_role.members, users_opts, remove)
# Check if user.profile is available, otherwise force user.save()
try:
_ = user.profile
except ValueError:
force_user_update = True
finally:
if force_user_update:
user.save()
# Update user profile to store LDAP DN. # Update user profile to store LDAP DN.
if force_user_update: profile = user.profile
user.save() if profile.ldap_dn != ldap_user.dn:
profile = user.profile profile.ldap_dn = ldap_user.dn
if profile.ldap_dn != ldap_user.dn: profile.save()
profile.ldap_dn = ldap_user.dn
profile.save()