Fix OAuth w/ ext_perm_user for multi-tenant #4723
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
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
![greptile-apps[bot]](https://avatars.githubusercontent.com/in/867647?s=60&v=4){kind=small}
There was a problem hiding this comment.
PR Summary
This PR modifies the OAuth user authentication flow in backend/onyx/auth/users.py to better handle multi-tenant scenarios by improving session user matching and error handling.
- Removed redundant null checks after user creation in OAuth flow, simplifying error propagation
- Added session user matching logic to reuse existing authenticated users when email/OAuth credentials match
- Removed explicit HTTP 500 error responses in favor of letting exceptions propagate naturally
- Streamlined user creation and OAuth account linking to handle multi-tenant scenarios more gracefully
1 file(s) reviewed, no comment(s)
Edit PR Review Bot Settings | Greptile
Weves
commented
May 16, 2025
| user = await self.user_db.create(user_dict) | ||
|
|
||
| # Add OAuth account only if user creation was successful | ||
| if user is not None: |
Weves
commented
May 16, 2025
| ) | ||
|
|
||
| # Ensure user is not None before proceeding | ||
| if user is None: |
Weves
commented
May 16, 2025
| async with AsyncSession(engine, expire_on_commit=False) as async_session: | ||
| # set the search path on sync session as well to be extra safe | ||
| async_session.info["tenant_id"] = tenant_id | ||
| event.listen( |
There was a problem hiding this comment.
seemingly the search_path gets reset after every commit on the async session?
There was a problem hiding this comment.
not 100% sure, but that's what I was observing
rkuo-danswer
approved these changes
May 16, 2025
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
ferdinandl007
pushed a commit
to ferdinandl007/onyx
that referenced
this pull request
May 19, 2025
* Fix OAuth w/ ext_perm_user for multi-tenant * Improve comment
aronszanto
pushed a commit
to aronszanto/onyx
that referenced
this pull request
May 27, 2025
* Fix OAuth w/ ext_perm_user for multi-tenant * Improve comment
ZhipengHe
pushed a commit
to ZhipengHe/onyx
that referenced
this pull request
Jun 6, 2025
* Fix OAuth w/ ext_perm_user for multi-tenant * Improve comment
AnkitTukatek
pushed a commit
to TukaTek/onyx
that referenced
this pull request
Sep 23, 2025
* Fix OAuth w/ ext_perm_user for multi-tenant * Improve comment
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.
Description
Fixes https://linear.app/danswer/issue/DAN-1981/fix-oauth-with-ext-perm-user-on-cloud
How Has This Been Tested?
Tested w/ multi-tenant set up locally.
Backporting (check the box to trigger backport action)
Note: You have to check that the action passes, otherwise resolve the conflicts manually and tag the patches.