Skip to content

Commit 4ad7334

Browse files
authored
Fixed user retrieval and creation issues (#4)
1 parent 6e9c452 commit 4ad7334

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

django_saml2_auth/views.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@ def denied(r):
146146
return render(r, 'django_saml2_auth/denied.html')
147147

148148

149-
def _create_new_user(email, firstname, lastname):
150-
user = User.objects.create_user(email)
149+
def _create_new_user(username, email, firstname, lastname):
150+
user = User.objects.create_user(username, email)
151151
user.first_name = firstname
152152
user.last_name = lastname
153153
groups = [Group.objects.get(name=x) for x in settings.SAML2_AUTH.get(
@@ -210,13 +210,12 @@ def acs(r):
210210
**{User.USERNAME_FIELD: user_name})
211211
else:
212212
target_user = User.objects.get(
213-
{User.USERNAME_FIELD__iexact: user_name})
213+
{"{}__iexact".format(User.USERNAME_FIELD): user_name})
214214
except User.DoesNotExist:
215215
new_user_should_be_created = settings.SAML2_AUTH.get(
216216
'CREATE_USER', True)
217217
if new_user_should_be_created:
218-
target_user = _create_new_user(
219-
user_email, user_first_name, user_last_name)
218+
target_user = _create_new_user(user_name, user_email, user_first_name, user_last_name)
220219

221220
if settings.SAML2_AUTH.get('TRIGGER', {}).get('CREATE_USER', None):
222221
run_hook(settings.SAML2_AUTH['TRIGGER']
@@ -261,7 +260,7 @@ def acs(r):
261260
**{User.USERNAME_FIELD: user_name})
262261
else:
263262
target_user = User.objects.get(
264-
{User.USERNAME_FIELD__iexact: user_name})
263+
{"{}__iexact".format(User.USERNAME_FIELD): user_name})
265264

266265
if settings.SAML2_AUTH.get('USE_JWT') is True and target_user.is_active:
267266
# We use JWT auth send token to frontend

0 commit comments

Comments
 (0)