highperfocused/danswer
1
0
Fork 0
mirror of https://github.com/danswer-ai/danswer.git synced 2025-07-25 12:23:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

nit

Browse Source
This commit is contained in:
pablodanswer
2024-12-29 20:12:02 -05:00
parent 8d6e8269b7
commit 97a03e7fc8
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
backend/onyx/auth/schemas.py
View File

@@ -48,15 +48,6 @@ class UserCreate(schemas.BaseUserCreate):
tenant_id: str | None = None tenant_id: str | None = None
class UserUpdateWithRoleForManager(schemas.BaseUserUpdate):
"""
This schema is used internally by the UserManager class when creating or updating users
that require role updates. It allows passing the role without exposing it in all default endpoints.
"""
role: UserRole
class UserUpdate(schemas.BaseUserUpdate): class UserUpdate(schemas.BaseUserUpdate):
""" """
Role updates are not allowed through the user update endpoint for security reasons Role updates are not allowed through the user update endpoint for security reasons

5
backend/onyx/auth/users.py
View File

@@ -55,7 +55,7 @@ from onyx.auth.email_utils import send_user_verification_email
from onyx.auth.invited_users import get_invited_users from onyx.auth.invited_users import get_invited_users
from onyx.auth.schemas import UserCreate from onyx.auth.schemas import UserCreate
from onyx.auth.schemas import UserRole from onyx.auth.schemas import UserRole
from onyx.auth.schemas import UserUpdateWithRoleForManager from onyx.auth.schemas import UserUpdate
from onyx.configs.app_configs import AUTH_TYPE from onyx.configs.app_configs import AUTH_TYPE
from onyx.configs.app_configs import DISABLE_AUTH from onyx.configs.app_configs import DISABLE_AUTH
from onyx.configs.app_configs import EMAIL_CONFIGURED from onyx.configs.app_configs import EMAIL_CONFIGURED
@@ -250,9 +250,8 @@ class UserManager(UUIDIDMixin, BaseUserManager[User, uuid.UUID]):
user = await self.get_by_email(user_create.email) user = await self.get_by_email(user_create.email)
# Handle case where user has used product outside of web and is now creating an account through web # Handle case where user has used product outside of web and is now creating an account through web
if not user.role.is_web_login() and user_create.role.is_web_login(): if not user.role.is_web_login() and user_create.role.is_web_login():
user_update = UserUpdateWithRoleForManager( user_update = UserUpdate(
password=user_create.password, password=user_create.password,
role=user_create.role,
is_verified=user_create.is_verified, is_verified=user_create.is_verified,
) )
user = await self.update(user_update, user) user = await self.update(user_update, user)