make external permissioned user creation case insensitive #3196
Conversation
This file contains 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 ↗︎
|
hagen-danswer
commented
Nov 21, 2024
| @@ -103,17 +103,6 @@ def list_users( | |||
| return db_session.scalars(stmt).unique().all() | |||
|
|
|||
|
|
|||
There was a problem hiding this comment.
moved this down to be closer to other logic
| @@ -128,7 +117,7 @@ def fetch_user_by_id(db_session: Session, user_id: UUID) -> User | None: | |||
| return db_session.query(User).filter(User.id == user_id).first() # type: ignore | |||
|
|
|||
|
|
|||
| def _generate_non_web_slack_user(email: str) -> User: | |||
| def _generate_slack_user(email: str) -> User: | |||
| fastapi_users_pw_helper = PasswordHelper() | |||
There was a problem hiding this comment.
var name changes
| def _get_users_by_emails( | ||
| db_session: Session, lower_emails: list[str] | ||
| ) -> tuple[list[User], list[str]]: | ||
| stmt = select(User).filter(func.lower(User.email).in_(lower_emails)) # type: ignore |
There was a problem hiding this comment.
this was main change: we now do a case insensitive user search and a case insensitive check for missing user emails.
I believe this is what caused admins to be set to externally permissioned users as this is the only place in the code where role is set to UserRole.EXT_PERM_USER. the failure case was there was a case mismatch for user upserting so now there are 2 users in the db with different roles. im looking into creating an alembic upgrade to fix it
|
replaced by: |
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
^
Mental Checklist:
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.