From 15543feac148363e3a0007ba3d9f9c21b32b0bf0 Mon Sep 17 00:00:00 2001
From: Weves <chrisweaver101@gmail.com>
Date: Sun, 18 Jun 2023 22:18:38 -0600
Subject: [PATCH] Fix missing sources when auth is on

---
 .../admin/connectors/google-drive/auth/callback/route.ts  | 6 ++----
 web/src/app/page.tsx                                      | 5 ++++-
 web/src/lib/userSS.ts                                     | 8 ++++++++
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/web/src/app/admin/connectors/google-drive/auth/callback/route.ts b/web/src/app/admin/connectors/google-drive/auth/callback/route.ts
index ba740a72a319..3a82df64c8f7 100644
--- a/web/src/app/admin/connectors/google-drive/auth/callback/route.ts
+++ b/web/src/app/admin/connectors/google-drive/auth/callback/route.ts
@@ -3,6 +3,7 @@ import { buildUrl } from "@/lib/utilsSS";
 import { NextRequest, NextResponse } from "next/server";
 import { cookies } from "next/headers";
 import { GOOGLE_DRIVE_AUTH_IS_ADMIN_COOKIE_NAME } from "@/lib/constants";
+import { processCookies } from "@/lib/userSS";
 
 export const GET = async (request: NextRequest) => {
   // 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(), {
     headers: {
-      cookie: cookies()
-        .getAll()
-        .map((cookie) => `${cookie.name}=${cookie.value}`)
-        .join("; "),
+      cookie: processCookies(cookies()),
     },
   });
 
diff --git a/web/src/app/page.tsx b/web/src/app/page.tsx
index 1f5bd0ac6515..5c16b5f65b5a 100644
--- a/web/src/app/page.tsx
+++ b/web/src/app/page.tsx
@@ -1,6 +1,6 @@
 import { SearchSection } from "@/components/search/SearchSection";
 import { Header } from "@/components/Header";
-import { getCurrentUserSS } from "@/lib/userSS";
+import { getCurrentUserSS, processCookies } from "@/lib/userSS";
 import { redirect } from "next/navigation";
 import { DISABLE_AUTH } from "@/lib/constants";
 import { HealthCheckBanner } from "@/components/health/healthcheck";
@@ -15,6 +15,9 @@ export default async function Home() {
     DISABLE_AUTH ? (async () => null)() : getCurrentUserSS(),
     fetch(buildUrl("/manage/connector"), {
       next: { revalidate: 0 },
+      headers: {
+        cookie: processCookies(cookies()),
+      },
     }),
   ];
 
diff --git a/web/src/lib/userSS.ts b/web/src/lib/userSS.ts
index df506ecbdb3f..fec47551e586 100644
--- a/web/src/lib/userSS.ts
+++ b/web/src/lib/userSS.ts
@@ -1,6 +1,7 @@
 import { cookies } from "next/headers";
 import { User } from "./types";
 import { buildUrl } from "./utilsSS";
+import { ReadonlyRequestCookies } from "next/dist/server/web/spec-extension/adapters/request-cookies";
 
 export const getGoogleOAuthUrlSS = async (): Promise<string> => {
   const res = await fetch(buildUrl("/auth/google/authorize"));
@@ -35,3 +36,10 @@ export const getCurrentUserSS = async (): Promise<User | null> => {
     return null;
   }
 };
+
+export const processCookies = (cookies: ReadonlyRequestCookies): string => {
+  return cookies
+    .getAll()
+    .map((cookie) => `${cookie.name}=${cookie.value}`)
+    .join("; ");
+};