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

Fix missing sources when auth is on

Browse Source
This commit is contained in:
Weves
2023-06-18 22:18:38 -06:00
committed by Chris Weaver
parent 8ba739b4d2
commit 15543feac1
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
web/src/app/admin/connectors/google-drive/auth/callback/route.ts
View File

@@ -3,6 +3,7 @@ import { buildUrl } from "@/lib/utilsSS";
import { NextRequest, NextResponse } from "next/server"; import { NextRequest, NextResponse } from "next/server";
import { cookies } from "next/headers"; import { cookies } from "next/headers";
import { GOOGLE_DRIVE_AUTH_IS_ADMIN_COOKIE_NAME } from "@/lib/constants"; import { GOOGLE_DRIVE_AUTH_IS_ADMIN_COOKIE_NAME } from "@/lib/constants";
import { processCookies } from "@/lib/userSS";
export const GET = async (request: NextRequest) => { export const GET = async (request: NextRequest) => {
// Wrapper around the FastAPI endpoint /connectors/google-drive/callback, // Wrapper around the FastAPI endpoint /connectors/google-drive/callback,
@@ -12,10 +13,7 @@ export const GET = async (request: NextRequest) => {
const response = await fetch(url.toString(), { const response = await fetch(url.toString(), {
headers: { headers: {
cookie: cookies() cookie: processCookies(cookies()),
.getAll()
.map((cookie) => `${cookie.name}=${cookie.value}`)
.join("; "),
}, },
}); });

5
web/src/app/page.tsx
View File

@@ -1,6 +1,6 @@
import { SearchSection } from "@/components/search/SearchSection"; import { SearchSection } from "@/components/search/SearchSection";
import { Header } from "@/components/Header"; import { Header } from "@/components/Header";
import { getCurrentUserSS } from "@/lib/userSS"; import { getCurrentUserSS, processCookies } from "@/lib/userSS";
import { redirect } from "next/navigation"; import { redirect } from "next/navigation";
import { DISABLE_AUTH } from "@/lib/constants"; import { DISABLE_AUTH } from "@/lib/constants";
import { HealthCheckBanner } from "@/components/health/healthcheck"; import { HealthCheckBanner } from "@/components/health/healthcheck";
@@ -15,6 +15,9 @@ export default async function Home() {
DISABLE_AUTH ? (async () => null)() : getCurrentUserSS(), DISABLE_AUTH ? (async () => null)() : getCurrentUserSS(),
fetch(buildUrl("/manage/connector"), { fetch(buildUrl("/manage/connector"), {
next: { revalidate: 0 }, next: { revalidate: 0 },
headers: {
cookie: processCookies(cookies()),
},
}), }),
]; ];

8
web/src/lib/userSS.ts
View File

@@ -1,6 +1,7 @@
import { cookies } from "next/headers"; import { cookies } from "next/headers";
import { User } from "./types"; import { User } from "./types";
import { buildUrl } from "./utilsSS"; import { buildUrl } from "./utilsSS";
import { ReadonlyRequestCookies } from "next/dist/server/web/spec-extension/adapters/request-cookies";
export const getGoogleOAuthUrlSS = async (): Promise<string> => { export const getGoogleOAuthUrlSS = async (): Promise<string> => {
const res = await fetch(buildUrl("/auth/google/authorize")); const res = await fetch(buildUrl("/auth/google/authorize"));
@@ -35,3 +36,10 @@ export const getCurrentUserSS = async (): Promise<User | null> => {
return null; return null;
} }
}; };
export const processCookies = (cookies: ReadonlyRequestCookies): string => {
return cookies
.getAll()
.map((cookie) => `${cookie.name}=${cookie.value}`)
.join("; ");
};