Skip to content

restore #30 "if user attribute is callable then call it..." #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
knaperek merged 3 commits into from
Dec 18, 2016
Merged

restore #30 "if user attribute is callable then call it..." #45

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8524655
restore #30 "if user attribute is callable then call it..."
joetsoi Nov 28, 2016
ba00e86
Update models.py
joetsoi Dec 7, 2016
be53998
Add test for callable saml attribute mapping
joetsoi Dec 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
restore #30 "if user attribute is callable then call it..."
  • Loading branch information
@joetsoi
joetsoi authored Nov 28, 2016
commit 8524655dcf1a03a80483a15197c992ce73d47d8b
10 changes: 8 additions & 2 deletions djangosaml2/backends.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,14 @@ def update_user(self, user, attributes, attribute_mapping,
try:
for attr in django_attrs:
if hasattr(user, attr):
modified = self._set_attribute(
user, attr, attributes[saml_attr][0])
user_attr = getattr(user, attr)
if callable(user_attr):
modified = user_attr(
attributes[saml_attr])
else:
modified = self._set_attribute(
user, attr, attributes[saml_attr][0])

user_modified = user_modified or modified

elif profile is not None and hasattr(profile, attr):
Expand Down