highperfocused/danswer
1
0
Fork 0
mirror of https://github.com/danswer-ai/danswer.git synced 2025-04-13 06:19:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Feedback (#3800)

Browse Source 
* k

* k:wq

* update user auth

* update
This commit is contained in:
pablonyx 2025-01-27 19:13:21 -08:00 committed by GitHub
parent 118d2b52e6
commit 519ec20d05
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,6 +42,10 @@ class UserCreate(schemas.BaseUserCreate):
tenant_id: str | None = None
class UserUpdateWithRole(schemas.BaseUserUpdate):
role: UserRole
class UserUpdate(schemas.BaseUserUpdate):
"""
Role updates are not allowed through the user update endpoint for security reasons

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

@ -57,7 +57,7 @@ from onyx.auth.invited_users import get_invited_users
from onyx.auth.schemas import AuthBackend
from onyx.auth.schemas import UserCreate
from onyx.auth.schemas import UserRole
from onyx.auth.schemas import UserUpdate
from onyx.auth.schemas import UserUpdateWithRole
from onyx.configs.app_configs import AUTH_BACKEND
from onyx.configs.app_configs import AUTH_COOKIE_EXPIRE_TIME_SECONDS
from onyx.configs.app_configs import AUTH_TYPE
@ -216,7 +216,6 @@ class UserManager(UUIDIDMixin, BaseUserManager[User, uuid.UUID]):
reset_password_token_secret = USER_AUTH_SECRET
verification_token_secret = USER_AUTH_SECRET
verification_token_lifetime_seconds = AUTH_COOKIE_EXPIRE_TIME_SECONDS
user_db: SQLAlchemyUserDatabase[User, uuid.UUID]
async def create(
@ -246,10 +245,8 @@ class UserManager(UUIDIDMixin, BaseUserManager[User, uuid.UUID]):
referral_source=referral_source,
request=request,
)
async with get_async_session_with_tenant(tenant_id) as db_session:
token = CURRENT_TENANT_ID_CONTEXTVAR.set(tenant_id)
verify_email_is_invited(user_create.email)
verify_email_domain(user_create.email)
if MULTI_TENANT:
@ -268,16 +265,16 @@ class UserManager(UUIDIDMixin, BaseUserManager[User, uuid.UUID]):
user_create.role = UserRole.ADMIN
else:
user_create.role = UserRole.BASIC
try:
user = await super().create(user_create, safe=safe, request=request) # type: ignore
except exceptions.UserAlreadyExists:
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
if not user.role.is_web_login() and user_create.role.is_web_login():
user_update = UserUpdate(
user_update = UserUpdateWithRole(
password=user_create.password,
is_verified=user_create.is_verified,
role=user_create.role,
)
user = await self.update(user_update, user)
else:
@ -285,7 +282,6 @@ class UserManager(UUIDIDMixin, BaseUserManager[User, uuid.UUID]):
finally:
CURRENT_TENANT_ID_CONTEXTVAR.reset(token)
return user
async def validate_password(self, password: str, _: schemas.UC | models.UP) -> None:

2
web/src/app/chat/input/ChatInputBar.tsx
View File

@ -534,7 +534,7 @@ export function ChatInputBar({
filterManager.selectedDocumentSets.length > 0 ||
filterManager.selectedTags.length > 0 ||
filterManager.selectedSources.length > 0) && (
<div className="flex gap-x-.5 px-2">
<div className="flex bg-background gap-x-.5 px-2">
<div className="flex gap-x-1 px-2 overflow-visible overflow-x-scroll items-end miniscroll">
{filterManager.selectedTags &&
filterManager.selectedTags.map((tag, index) => (

8
web/src/app/ee/admin/groups/[groupId]/AddMemberForm.tsx
View File

@ -21,8 +21,12 @@ export const AddMemberForm: React.FC<AddMemberFormProps> = ({
const [selectedUserIds, setSelectedUserIds] = useState<string[]>([]);
return (
<Modal title="Add New User" onOutsideClick={() => onClose()}>
<div className="px-6 pt-4 pb-12">
<Modal
className="max-w-xl"
title="Add New User"
onOutsideClick={() => onClose()}
>
<div className="flex flex-col">
<UserEditor
selectedUserIds={selectedUserIds}
setSelectedUserIds={setSelectedUserIds}

4
web/src/components/Modal.tsx
View File

@ -120,9 +120,7 @@ export function Modal({
</>
)}
</div>
<div className="flex-grow overflow-y-auto overflow-x-hidden">
{children}
</div>
{children}
</div>
</div>
);

2
web/src/components/UserDropdown.tsx
View File

@ -160,7 +160,7 @@ export function UserDropdown({
{user && user.email ? user.email[0].toUpperCase() : "A"}
</div>
{notifications && notifications.length > 0 && (
<div className="absolute right-0 top-0 w-3 h-3 bg-red-500 rounded-full"></div>
<div className="absolute -right-0.5 -top-0.5 w-3 h-3 bg-red-500 rounded-full"></div>
)}
</div>
}

14
web/src/components/context/ChatContext.tsx
View File

@ -11,6 +11,8 @@ import {
import { ChatSession, InputPrompt } from "@/app/chat/interfaces";
import { LLMProviderDescriptor } from "@/app/admin/configuration/llm/interfaces";
import { Folder } from "@/app/chat/folders/interfaces";
import { useSearchParams } from "next/navigation";
import { useRouter } from "next/navigation";
interface ChatContextProps {
chatSessions: ChatSession[];
@ -49,6 +51,8 @@ export const ChatProvider: React.FC<{
>;
children: React.ReactNode;
}> = ({ value, children }) => {
const router = useRouter();
const searchParams = useSearchParams();
const [inputPrompts, setInputPrompts] = useState(value?.inputPrompts || []);
const [chatSessions, setChatSessions] = useState(value?.chatSessions || []);
const [folders, setFolders] = useState(value?.folders || []);
@ -70,6 +74,16 @@ export const ChatProvider: React.FC<{
if (!response.ok) throw new Error("Failed to fetch chat sessions");
const { sessions } = await response.json();
setChatSessions(sessions);
const currentSessionId = searchParams.get("chatId");
if (
currentSessionId &&
!sessions.some(
(session: ChatSession) => session.id === currentSessionId
)
) {
router.replace("/chat");
}
} catch (error) {
console.error("Error refreshing chat sessions:", error);
}