🔐 fix: Add Tenant Context to Admin OAuth Callback Routes#12579
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Fixes admin SSO callback failures under tenant isolation strict mode by ensuring tenant AsyncLocalStorage context is established for admin OAuth callback routes before admin capability checks and downstream DB access.
Changes:
- Import
tenantContextMiddlewarefrom@librechat/api. - Add
tenantContextMiddlewareimmediately afterpassport.authenticate(...)on all admin OAuth callback routes (OpenID, SAML, Google, GitHub, Discord, Facebook, Apple).
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Owner
|
@codex review |
|
Codex Review: Didn't find any major issues. Breezy! ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
If Codex has suggestions, it will comment; otherwise it will react with 👍. Codex can also answer questions or update the PR. Try commenting "@codex address that feedback". |
jcbartle
pushed a commit
to jcbartle/LibreChat
that referenced
this pull request
May 11, 2026
…#12579) * 🔐 fix: Add Tenant Context to Admin OAuth Callback Routes * fix: add tenant context to admin local login route
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
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.
Summary
Admin OAuth callback routes (OpenID, SAML, Google, GitHub, Discord, Facebook, Apple) were missing
tenantContextMiddlewareafterpassport.authenticate. This causedrequireCapability(ACCESS_ADMIN)to fail with[TenantIsolation] Query attempted without tenant context in strict mode, returning a 500 on the callback.The normal login flow uses
requireJwtAuthwhich chains intotenantContextMiddlewareautomatically. The admin OAuth callbacks bypassrequireJwtAuthand use passport directly, so they needtenantContextMiddlewareadded explicitly.Change Type
Testing
Checklist