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

Very minor auth standardization (#4400)

Browse Source
This commit is contained in:
pablonyx 2025-04-01 11:46:49 -07:00 committed by Weves
parent 7491cdd0f0
commit 2a87837ce1
24 changed files with 4330 additions and 7904 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend/ee/onyx/server/saml.py
View File

@ -36,9 +36,6 @@ from onyx.utils.logger import setup_logger
logger = setup_logger()
router = APIRouter(prefix="/auth/saml")
# Define non-authenticated user roles that should be re-created during SAML login
NON_AUTHENTICATED_ROLES = {UserRole.SLACK_USER, UserRole.EXT_PERM_USER}
async def upsert_saml_user(email: str) -> User:
logger.debug(f"Attempting to upsert SAML user with email: {email}")
@ -54,7 +51,7 @@ async def upsert_saml_user(email: str) -> User:
try:
user = await user_manager.get_by_email(email)
# If user has a non-authenticated role, treat as non-existent
if user.role in NON_AUTHENTICATED_ROLES:
if not user.role.is_web_login():
raise exceptions.UserNotExists()
return user
except exceptions.UserNotExists:

1
web/Dockerfile
View File

@ -42,7 +42,6 @@ ENV NEXT_PUBLIC_DISABLE_STREAMING=${NEXT_PUBLIC_DISABLE_STREAMING}
ARG NEXT_PUBLIC_NEW_CHAT_DIRECTS_TO_SAME_PERSONA
ENV NEXT_PUBLIC_NEW_CHAT_DIRECTS_TO_SAME_PERSONA=${NEXT_PUBLIC_NEW_CHAT_DIRECTS_TO_SAME_PERSONA}
# allow user to specify custom feedback options
ARG NEXT_PUBLIC_POSITIVE_PREDEFINED_FEEDBACK_OPTIONS
ENV NEXT_PUBLIC_POSITIVE_PREDEFINED_FEEDBACK_OPTIONS=${NEXT_PUBLIC_POSITIVE_PREDEFINED_FEEDBACK_OPTIONS}

12090
web/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

3
web/package.json
View File

@ -93,11 +93,12 @@
},
"devDependencies": {
"@chromatic-com/playwright": "^0.10.2",
"@playwright/test": "^1.39.0",
"@tailwindcss/typography": "^0.5.10",
"@types/chrome": "^0.0.287",
"@types/jest": "^29.5.14",
"chromatic": "^11.25.2",
"eslint": "^8.48.0",
"eslint": "^8.57.1",
"eslint-config-next": "^14.1.0",
"jest": "^29.7.0",
"prettier": "2.8.8",

2
web/src/app/PostHogPageView.tsx
View File

@ -17,7 +17,7 @@ export default function PostHogPageView(): null {
// Track pageviews
if (pathname) {
let url = window.origin + pathname;
if (searchParams.toString()) {
if (searchParams?.toString()) {
url = url + `?${searchParams.toString()}`;
}
posthog.capture("$pageview", {

12
web/src/app/admin/assistants/AssistantEditor.tsx
View File

@ -149,7 +149,7 @@ export function AssistantEditor({
const { refreshAssistants, isImageGenerationAvailable } = useAssistants();
const router = useRouter();
const searchParams = useSearchParams();
const isAdminPage = searchParams.get("admin") === "true";
const isAdminPage = searchParams?.get("admin") === "true";
const { popup, setPopup } = usePopup();
const { labels, refreshLabels, createLabel, updateLabel, deleteLabel } =
@ -469,8 +469,14 @@ export function AssistantEditor({
description: Yup.string().required(
"Must provide a description for the Assistant"
),
system_prompt: Yup.string(),
task_prompt: Yup.string(),
system_prompt: Yup.string().max(
8000,
"Instructions must be less than 8000 characters"
),
task_prompt: Yup.string().max(
8000,
"Reminders must be less than 8000 characters"
),
is_public: Yup.boolean().required(),
document_set_ids: Yup.array().of(Yup.number()),
num_chunks: Yup.number().nullable(),

4
web/src/app/admin/connectors/[connector]/oauth/callback/page.tsx
View File

@ -26,8 +26,8 @@ export default function OAuthCallbackPage() {
);
// Extract query parameters
const code = searchParams.get("code");
const state = searchParams.get("state");
const code = searchParams?.get("code");
const state = searchParams?.get("state");
const pathname = usePathname();
const connector = pathname?.split("/")[3];

5
web/src/app/admin/connectors/[connector]/oauth/finalize/page.tsx
View File

@ -4,7 +4,6 @@ import { useEffect, useState } from "react";
import { usePathname, useRouter, useSearchParams } from "next/navigation";
import { AdminPageTitle } from "@/components/admin/Title";
import { Button } from "@/components/ui/button";
import Title from "@/components/ui/title";
import { KeyIcon } from "@/components/icons/icons";
import { getSourceMetadata, isValidSource } from "@/lib/sources";
import { ConfluenceAccessibleResource, ValidSources } from "@/lib/types";
@ -74,7 +73,7 @@ export default function OAuthFinalizePage() {
>([]);
// Extract query parameters
const credentialParam = searchParams.get("credential");
const credentialParam = searchParams?.get("credential");
const credential = credentialParam ? parseInt(credentialParam, 10) : NaN;
const pathname = usePathname();
const connector = pathname?.split("/")[3];
@ -85,7 +84,7 @@ export default function OAuthFinalizePage() {
// connector (url segment)= "google-drive"
// sourceType (for looking up metadata) = "google_drive"
if (isNaN(credential)) {
if (isNaN(credential) || !connector) {
setStatusMessage("Improperly formed OAuth finalization request.");
setStatusDetails("Invalid or missing credential id.");
setIsError(true);

4
web/src/app/auth/reset-password/page.tsx
View File

@ -23,8 +23,8 @@ const ResetPasswordPage: React.FC = () => {
const { popup, setPopup } = usePopup();
const [isWorking, setIsWorking] = useState(false);
const searchParams = useSearchParams();
const token = searchParams.get("token");
const tenantId = searchParams.get(TENANT_ID_COOKIE_NAME);
const token = searchParams?.get("token");
const tenantId = searchParams?.get(TENANT_ID_COOKIE_NAME);
// Keep search param same name as cookie for simplicity
useEffect(() => {

4
web/src/app/auth/verify-email/Verify.tsx
View File

@ -15,9 +15,9 @@ export function Verify({ user }: { user: User | null }) {
const [error, setError] = useState("");
const verify = useCallback(async () => {
const token = searchParams.get("token");
const token = searchParams?.get("token");
const firstUser =
searchParams.get("first_user") && NEXT_PUBLIC_CLOUD_ENABLED;
searchParams?.get("first_user") && NEXT_PUBLIC_CLOUD_ENABLED;
if (!token) {
setError(
"Missing verification token. Try requesting a new verification email."

36
web/src/app/chat/ChatPage.tsx
View File

@ -196,7 +196,9 @@ export function ChatPage({
setCurrentMessageFiles,
} = useDocumentsContext();
const defaultAssistantIdRaw = searchParams.get(SEARCH_PARAM_NAMES.PERSONA_ID);
const defaultAssistantIdRaw = searchParams?.get(
SEARCH_PARAM_NAMES.PERSONA_ID
);
const defaultAssistantId = defaultAssistantIdRaw
? parseInt(defaultAssistantIdRaw)
: undefined;
@ -252,8 +254,8 @@ export function ChatPage({
);
const { user, isAdmin } = useUser();
const slackChatId = searchParams.get("slackChatId");
const existingChatIdRaw = searchParams.get("chatId");
const slackChatId = searchParams?.get("slackChatId");
const existingChatIdRaw = searchParams?.get("chatId");
const [showHistorySidebar, setShowHistorySidebar] = useState(false);
@ -275,7 +277,7 @@ export function ChatPage({
const processSearchParamsAndSubmitMessage = (searchParamsString: string) => {
const newSearchParams = new URLSearchParams(searchParamsString);
const message = newSearchParams.get("user-prompt");
const message = newSearchParams?.get("user-prompt");
filterManager.buildFiltersFromQueryString(
newSearchParams.toString(),
@ -284,7 +286,7 @@ export function ChatPage({
tags
);
const fileDescriptorString = newSearchParams.get(SEARCH_PARAM_NAMES.FILES);
const fileDescriptorString = newSearchParams?.get(SEARCH_PARAM_NAMES.FILES);
const overrideFileDescriptors: FileDescriptor[] = fileDescriptorString
? JSON.parse(decodeURIComponent(fileDescriptorString))
: [];
@ -324,7 +326,7 @@ export function ChatPage({
: undefined
);
// Gather default temperature settings
const search_param_temperature = searchParams.get(
const search_param_temperature = searchParams?.get(
SEARCH_PARAM_NAMES.TEMPERATURE
);
@ -551,7 +553,7 @@ export function ChatPage({
if (
newMessageHistory.length === 1 &&
!submitOnLoadPerformed.current &&
searchParams.get(SEARCH_PARAM_NAMES.SEEDED) === "true"
searchParams?.get(SEARCH_PARAM_NAMES.SEEDED) === "true"
) {
submitOnLoadPerformed.current = true;
const seededMessage = newMessageHistory[0].message;
@ -572,11 +574,11 @@ export function ChatPage({
initialSessionFetch();
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [existingChatSessionId, searchParams.get(SEARCH_PARAM_NAMES.PERSONA_ID)]);
}, [existingChatSessionId, searchParams?.get(SEARCH_PARAM_NAMES.PERSONA_ID)]);
useEffect(() => {
const userFolderId = searchParams.get(SEARCH_PARAM_NAMES.USER_FOLDER_ID);
const allMyDocuments = searchParams.get(
const userFolderId = searchParams?.get(SEARCH_PARAM_NAMES.USER_FOLDER_ID);
const allMyDocuments = searchParams?.get(
SEARCH_PARAM_NAMES.ALL_MY_DOCUMENTS
);
@ -599,14 +601,14 @@ export function ChatPage({
}
}, [
userFolders,
searchParams.get(SEARCH_PARAM_NAMES.USER_FOLDER_ID),
searchParams.get(SEARCH_PARAM_NAMES.ALL_MY_DOCUMENTS),
searchParams?.get(SEARCH_PARAM_NAMES.USER_FOLDER_ID),
searchParams?.get(SEARCH_PARAM_NAMES.ALL_MY_DOCUMENTS),
addSelectedFolder,
clearSelectedItems,
]);
const [message, setMessage] = useState(
searchParams.get(SEARCH_PARAM_NAMES.USER_PROMPT) || ""
searchParams?.get(SEARCH_PARAM_NAMES.USER_PROMPT) || ""
);
const [completeMessageDetail, setCompleteMessageDetail] = useState<
@ -1048,7 +1050,7 @@ export function ChatPage({
// Equivalent to `loadNewPageLogic`
useEffect(() => {
if (searchParams.get(SEARCH_PARAM_NAMES.SEND_ON_LOAD)) {
if (searchParams?.get(SEARCH_PARAM_NAMES.SEND_ON_LOAD)) {
processSearchParamsAndSubmitMessage(searchParams.toString());
}
}, [searchParams, router]);
@ -1231,7 +1233,7 @@ export function ChatPage({
const isNewSession = chatSessionIdRef.current === null;
const searchParamBasedChatSessionName =
searchParams.get(SEARCH_PARAM_NAMES.TITLE) || null;
searchParams?.get(SEARCH_PARAM_NAMES.TITLE) || null;
if (isNewSession) {
currChatSessionId = await createChatSession(
@ -1409,11 +1411,11 @@ export function ChatPage({
modelVersion:
modelOverride?.modelName ||
llmManager.currentLlm.modelName ||
searchParams.get(SEARCH_PARAM_NAMES.MODEL_VERSION) ||
searchParams?.get(SEARCH_PARAM_NAMES.MODEL_VERSION) ||
undefined,
temperature: llmManager.temperature || undefined,
systemPromptOverride:
searchParams.get(SEARCH_PARAM_NAMES.SYSTEM_PROMPT) || undefined,
searchParams?.get(SEARCH_PARAM_NAMES.SYSTEM_PROMPT) || undefined,
useExistingUserMessage: isSeededChat,
useLanggraph:
settings?.settings.pro_search_enabled &&

8
web/src/app/chat/lib.tsx
View File

@ -668,7 +668,7 @@ const PARAMS_TO_SKIP = [
];
export function buildChatUrl(
existingSearchParams: ReadonlyURLSearchParams,
existingSearchParams: ReadonlyURLSearchParams | null,
chatSessionId: string | null,
personaId: number | null,
search?: boolean
@ -685,7 +685,7 @@ export function buildChatUrl(
finalSearchParams.push(`${SEARCH_PARAM_NAMES.PERSONA_ID}=${personaId}`);
}
existingSearchParams.forEach((value, key) => {
existingSearchParams?.forEach((value, key) => {
if (!PARAMS_TO_SKIP.includes(key)) {
finalSearchParams.push(`${key}=${value}`);
}
@ -719,7 +719,7 @@ export async function uploadFilesForChat(
return [responseJson.files as FileDescriptor[], null];
}
export async function useScrollonStream({
export function useScrollonStream({
chatState,
scrollableDivRef,
scrollDist,
@ -817,5 +817,5 @@ export async function useScrollonStream({
});
}
}
}, [chatState, distance, scrollDist, scrollableDivRef]);
}, [chatState, distance, scrollDist, scrollableDivRef, enableAutoScroll]);
}

6
web/src/app/chat/searchParams.ts
View File

@ -23,8 +23,10 @@ export const SEARCH_PARAM_NAMES = {
SEND_ON_LOAD: "send-on-load",
};
export function shouldSubmitOnLoad(searchParams: ReadonlyURLSearchParams) {
const rawSubmitOnLoad = searchParams.get(SEARCH_PARAM_NAMES.SUBMIT_ON_LOAD);
export function shouldSubmitOnLoad(
searchParams: ReadonlyURLSearchParams | null
) {
const rawSubmitOnLoad = searchParams?.get(SEARCH_PARAM_NAMES.SUBMIT_ON_LOAD);
if (rawSubmitOnLoad === "true" || rawSubmitOnLoad === "1") {
return true;
}

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

@ -104,7 +104,7 @@ export function UserDropdown({
// Construct the current URL
const currentUrl = `${pathname}${
searchParams.toString() ? `?${searchParams.toString()}` : ""
searchParams?.toString() ? `?${searchParams.toString()}` : ""
}`;
// Encode the current URL to use as a redirect parameter

4
web/src/components/admin/ClientLayout.tsx
View File

@ -59,8 +59,8 @@ export function ClientLayout({
const { llmProviders } = useChatContext();
const { popup, setPopup } = usePopup();
if (
pathname.startsWith("/admin/connectors") ||
pathname.startsWith("/admin/embeddings")
(pathname && pathname.startsWith("/admin/connectors")) ||
(pathname && pathname.startsWith("/admin/embeddings"))
) {
return <>{children}</>;
}

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

@ -76,7 +76,7 @@ export const ChatProvider: React.FC<{
const { sessions } = await response.json();
setChatSessions(sessions);
const currentSessionId = searchParams.get("chatId");
const currentSessionId = searchParams?.get("chatId");
if (
currentSessionId &&
!sessions.some(

10
web/src/components/context/EmbeddingContext.tsx
View File

@ -34,7 +34,7 @@ export const EmbeddingFormProvider: React.FC<{
const pathname = usePathname();
// Initialize formStep based on the URL parameter
const initialStep = parseInt(searchParams.get("step") || "0", 10);
const initialStep = parseInt(searchParams?.get("step") || "0", 10);
const [formStep, setFormStep] = useState(initialStep);
const [formValues, setFormValues] = useState<Record<string, any>>({});
@ -56,8 +56,10 @@ export const EmbeddingFormProvider: React.FC<{
useEffect(() => {
// Update URL when formStep changes
const updatedSearchParams = new URLSearchParams(searchParams.toString());
const existingStep = updatedSearchParams.get("step");
const updatedSearchParams = new URLSearchParams(
searchParams?.toString() || ""
);
const existingStep = updatedSearchParams?.get("step");
updatedSearchParams.set("step", formStep.toString());
const newUrl = `${pathname}?${updatedSearchParams.toString()}`;
@ -70,7 +72,7 @@ export const EmbeddingFormProvider: React.FC<{
// Update formStep when URL changes
useEffect(() => {
const stepFromUrl = parseInt(searchParams.get("step") || "0", 10);
const stepFromUrl = parseInt(searchParams?.get("step") || "0", 10);
if (stepFromUrl !== formStep) {
setFormStep(stepFromUrl);
}

10
web/src/components/context/FormContext.tsx
View File

@ -34,7 +34,7 @@ export const FormProvider: React.FC<{
const pathname = usePathname();
// Initialize formStep based on the URL parameter
const initialStep = parseInt(searchParams.get("step") || "0", 10);
const initialStep = parseInt(searchParams?.get("step") || "0", 10);
const [formStep, setFormStep] = useState(initialStep);
const [formValues, setFormValues] = useState<Record<string, any>>({});
@ -56,8 +56,10 @@ export const FormProvider: React.FC<{
useEffect(() => {
// Update URL when formStep changes
const updatedSearchParams = new URLSearchParams(searchParams.toString());
const existingStep = updatedSearchParams.get("step");
const updatedSearchParams = new URLSearchParams(
searchParams?.toString() || ""
);
const existingStep = updatedSearchParams?.get("step");
updatedSearchParams.set("step", formStep.toString());
const newUrl = `${pathname}?${updatedSearchParams.toString()}`;
@ -69,7 +71,7 @@ export const FormProvider: React.FC<{
}, [formStep, router, pathname, searchParams]);
useEffect(() => {
const stepFromUrl = parseInt(searchParams.get("step") || "0", 10);
const stepFromUrl = parseInt(searchParams?.get("step") || "0", 10);
if (stepFromUrl !== formStep) {
setFormStep(stepFromUrl);
}

6
web/src/components/health/healthcheck.tsx
View File

@ -35,7 +35,7 @@ export const HealthCheckBanner = () => {
useEffect(() => {
if (userError && userError.status === 403) {
logout().then(() => {
if (!pathname.includes("/auth")) {
if (!pathname?.includes("/auth")) {
setShowLoggedOutModal(true);
}
});
@ -61,7 +61,7 @@ export const HealthCheckBanner = () => {
expirationTimeoutRef.current = setTimeout(() => {
setExpired(true);
if (!pathname.includes("/auth")) {
if (!pathname?.includes("/auth")) {
setShowLoggedOutModal(true);
}
}, timeUntilExpire);
@ -205,7 +205,7 @@ export const HealthCheckBanner = () => {
}
if (error instanceof RedirectError || expired) {
if (!pathname.includes("/auth")) {
if (!pathname?.includes("/auth")) {
setShowLoggedOutModal(true);
}
return null;

4
web/src/components/initialSetup/welcome/WelcomeModal.tsx
View File

@ -19,12 +19,12 @@ function setWelcomeFlowComplete() {
Cookies.set(COMPLETED_WELCOME_FLOW_COOKIE, "true", { expires: 365 });
}
export function _CompletedWelcomeFlowDummyComponent() {
export function CompletedWelcomeFlowDummyComponent() {
setWelcomeFlowComplete();
return null;
}
export function _WelcomeModal({ user }: { user: User | null }) {
export function WelcomeModal({ user }: { user: User | null }) {
const router = useRouter();
const [providerOptions, setProviderOptions] = useState<

8
web/src/components/initialSetup/welcome/WelcomeModalWrapper.tsx
View File

@ -1,6 +1,6 @@
import {
_CompletedWelcomeFlowDummyComponent,
_WelcomeModal,
CompletedWelcomeFlowDummyComponent,
WelcomeModal as WelcomeModalComponent,
} from "./WelcomeModal";
import { COMPLETED_WELCOME_FLOW_COOKIE } from "./constants";
import { User } from "@/lib/types";
@ -24,8 +24,8 @@ export function WelcomeModal({
}) {
const hasCompletedWelcomeFlow = hasCompletedWelcomeFlowSS(requestCookies);
if (hasCompletedWelcomeFlow) {
return <_CompletedWelcomeFlowDummyComponent />;
return <CompletedWelcomeFlowDummyComponent />;
}
return <_WelcomeModal user={user} />;
return <WelcomeModalComponent user={user} />;
}

4
web/src/components/modals/NewTeamModal.tsx
View File

@ -31,13 +31,13 @@ export function NewTeamModal() {
const { setPopup } = usePopup();
useEffect(() => {
const hasNewTeamParam = searchParams.has("new_team");
const hasNewTeamParam = searchParams?.has("new_team");
if (hasNewTeamParam) {
setShowNewTeamModal(true);
fetchTenantInfo();
// Remove the new_team parameter from the URL without page reload
const newParams = new URLSearchParams(searchParams.toString());
const newParams = new URLSearchParams(searchParams?.toString() || "");
newParams.delete("new_team");
const newUrl =
window.location.pathname +

2
web/src/components/popup/PopupFromQuery.tsx
View File

@ -16,7 +16,7 @@ export const usePopupFromQuery = (messages: PopupMessages) => {
const searchParams = new URLSearchParams(window.location.search);
// Get the value for search param with key "message"
const messageValue = searchParams.get("message");
const messageValue = searchParams?.get("message");
// Check if any key from messages object is present in search params
if (messageValue && messageValue in messages) {

2
web/src/hooks/usePaginatedFetch.tsx
View File

@ -148,7 +148,7 @@ function usePaginatedFetch<T extends PaginatedType>({
// Updates the URL with the current page number
const updatePageUrl = useCallback(
(page: number) => {
if (currentPath) {
if (currentPath && searchParams) {
const params = new URLSearchParams(searchParams);
params.set("page", page.toString());
router.replace(`${currentPath}?${params.toString()}`, {