Add OAuth team selection for multi-team accounts (MCP)#10
Merged
Conversation
Multi-team accounts connecting an OAuth/MCP client (e.g. Claude) had no way to specify a team: the only mechanism was the X-Sendlit-Team-Id header, which generic OAuth clients never send, so every /mcp call hit require-team.ts's 409 team_required response right after authorizing. Adds a "select a team" step to the OAuth flow via oauth-provider's postLogin hook, shown only for multi-team accounts (mirrors Notion's workspace picker) — the choice is threaded through as the OAuth referenceId and lands on the minted access token as a team_id claim, which resolve-auth.ts now re-validates as live membership before trusting. Single-team accounts are unaffected. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Multi-team accounts connecting an OAuth/MCP client (e.g. Claude) had no way to specify a team: the only mechanism was the X-Sendlit-Team-Id header, which generic OAuth clients never send, so every /mcp call hit require-team.ts's 409 team_required response right after authorizing.
Adds a "select a team" step to the OAuth flow via oauth-provider's postLogin hook, shown only for multi-team accounts (mirrors Notion's workspace picker) — the choice is threaded through as the OAuth referenceId and lands on the minted access token as a team_id claim, which resolve-auth.ts now re-validates as live membership before trusting. Single-team accounts are unaffected.