Skip to content

Don't match pre-approved accounts when github id/node_id are unknown #19

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
ewdurbin merged 1 commit into from
Aug 26, 2026
Merged

Don't match pre-approved accounts when github id/node_id are unknown #19

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
12 changes: 6 additions & 6 deletions cla/tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,12 +116,12 @@ async def check_pull_request(
# Find and remove any PreApprovedAccounts, they do not need to sign
pre_approved_accounts = set()
for author in authors:
pre_approved_account = await PreApprovedAccount.objects.filter(
Q(github_id=author.id)
| Q(github_node_id=author.node_id)
| Q(github_login=author.login)
| Q(email_address__iexact=author.email)
).afirst()
q = Q(github_login=author.login) | Q(email_address__iexact=author.email)
if author.id:
q |= Q(github_id=author.id)
if author.node_id:
q |= Q(github_node_id=author.node_id)
pre_approved_account = await PreApprovedAccount.objects.filter(q).afirst()
if pre_approved_account:
pre_approved_accounts.add(author)

Expand Down
Loading