Skip to content

Do not return disabled userattributes #26

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

Open
jussih wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Do not return disabled userattributes #26

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions authdata/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def get(self, request, *args, **kwargs):
if user_data is None:
# queried user does not exist in the external source
return Response(None)
for user_attribute in user_obj.attributes.all():
for user_attribute in user_obj.attributes.filter(disabled_at__isnull=True):
# Add attributes to user data
user_data['attributes'].append({'name': user_attribute.attribute.name, 'value': user_attribute.value})
LOG.debug('/query returning data', extra={'data': {'user_data': repr(user_data)}})
Expand All @@ -131,7 +131,7 @@ def get(self, request, *args, **kwargs):

# New users are created in data source
user_obj = User.objects.get(username=user_data['username'])
for user_attribute in user_obj.attributes.all():
for user_attribute in user_obj.attributes.filter(disabled_at__isnull=True):
# Add attributes to user data
user_data['attributes'].append({'name': user_attribute.attribute.name, 'value': user_attribute.value})
LOG.debug('/query returning data', extra={'data': {'user_data': repr(user_data)}})
Expand Down