Skip to content

fix: fix 500 error when trying to login after creating users with no org #3

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
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: fix 500 error when trying to login after creating users with no org #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ff677c
fix login after creating users with no org
khaledosman May 2, 2025
f25b5f8
doc: update comment
khaledosman May 2, 2025
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
15 changes: 9 additions & 6 deletions core/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class Meta:
'created_at',
'updated_at',
]

class RunSerializer(serializers.ModelSerializer):
# If you want the workflow ID in the output:
workflow_id = serializers.UUIDField(source='workflow.id', read_only=True)
Expand All @@ -53,9 +53,12 @@ def get_token(cls, user):
# Get the standard token (refresh + access)
token = super().get_token(user)

# Add custom claims
# Make sure your CustomUser has an .org relation
token['org_id'] = str(user.org.id) # e.g. UUIDField
token['org_name'] = user.org.name # optional human-readable
if hasattr(user, 'org') and user.org:
token['org_id'] = str(user.org.id)
token['org_name'] = user.org.name
else:
# Default values for users without org (like superadmins) otherwise trying to access user.org throws
token['org_id'] = None
token['org_name'] = None

return token
return token