[pull] main from calcom:main #972
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* fix(ci): verify org membership via API when author_association fails
* refactor: use core team membership check instead of
org membership
* fix(ci): use GitHub App token for team membership check The default GITHUB_TOKEN doesn't have org-level permissions to query team membership via the teams.getMembershipForUserInOrg API. This causes the API to return 404 even for valid team members, making the trust check incorrectly fail for core team members. This change generates a short-lived GitHub App token with org-level access to properly verify team membership. Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix(ci): use getCollaboratorPermissionLevel for trust check Replace the team membership check (teams.getMembershipForUserInOrg) with getCollaboratorPermissionLevel which works with the default GITHUB_TOKEN. This approach: - Checks if users have write/maintain/admin access to the repo - Works without requiring a GitHub App token with org-level permissions - Is semantically correct: if someone can push to the repo, they're trusted The previous approach using teams.getMembershipForUserInOrg required org-level permissions that the default GITHUB_TOKEN doesn't have, causing 404 errors even for valid team members. Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * Apply suggestion from @keithwillcode --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )