Conversation
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
4781073 to
d5c54b9
Compare
pablonyx
commented
Mar 6, 2025
Comment on lines
+3
to
+17
| from fastapi import HTTPException | ||
| from fastapi import Response | ||
| from sqlalchemy.exc import IntegrityError | ||
|
|
||
| from ee.onyx.auth.users import generate_anonymous_user_jwt_token | ||
| from ee.onyx.configs.app_configs import ANONYMOUS_USER_COOKIE_NAME | ||
| from ee.onyx.server.tenants.anonymous_user_path import get_anonymous_user_path | ||
| from ee.onyx.server.tenants.anonymous_user_path import ( | ||
| get_tenant_id_for_anonymous_user_path, | ||
| ) | ||
| from ee.onyx.server.tenants.anonymous_user_path import modify_anonymous_user_path | ||
| from ee.onyx.server.tenants.anonymous_user_path import validate_anonymous_user_path | ||
| from ee.onyx.server.tenants.models import AnonymousUserPath | ||
| from onyx.auth.users import anonymous_user_enabled | ||
| from onyx.auth.users import current_admin_user |
Contributor
Author
There was a problem hiding this comment.
This is all just migrated from the existing structure. Happy to re-org if there is a better structure
pablonyx
commented
Mar 6, 2025
Comment on lines
+15
to
+16
| # Note: We don't add a prefix here as each router already has the /tenants prefix | ||
| router = APIRouter() |
Contributor
Author
There was a problem hiding this comment.
Simplify all the tenant-related routing into a single tenant router
rkuo-danswer
reviewed
Mar 7, 2025
Contributor
rkuo-danswer
left a comment
There was a problem hiding this comment.
When a user is invited, logs in, and accepts, he is presented with a flow that asks for Reauthentication and a "Password". It's unclear if the user is being asked for his old password or to create a new one (i assume it's to create a new one).
After clicking join, there is a brief green notification in the bottom right that asks the user to log in, which doesn't quite make sense as the user is then logged in automatically.
3b498af to
69db34d
Compare
rkuo-danswer
approved these changes
Mar 8, 2025
7ccb04a to
2317dfd
Compare
This was referenced Mar 11, 2025
Closed
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
2 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.
Description
Must go in in concert with these control plane changes: https://github.com/onyx-dot-app/danswer-control-plane/pull/27
Fixes https://linear.app/danswer/issue/DAN-1513/improved-tenant-switching-suggestion-to-join-existing-tenant
Logic
UserTenantMappingnow has anactivecolumn to track which tenant a user is currently active inNew Flows
Changes
How Has This Been Tested?
All flows
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.