support old gitlab token case, simplify getImage action, feedback

msukkari · msukkari · commit b556af5520bc · 2025-06-04T16:34:20.000-07:00
diff --git a/packages/web/src/actions.ts b/packages/web/src/actions.ts
@@ -1715,7 +1715,7 @@ export const getSearchContexts = async (domain: string) => sew(() =>
         }, /* minRequiredRole = */ OrgRole.GUEST), /* allowSingleTenantUnauthedAccess = */ true
     ));
 
-export const getRepoImage = async (repoId: number, domain: string): Promise<Response | ServiceError> => sew(async () => {
+export const getRepoImage = async (repoId: number, domain: string): Promise<ArrayBuffer | ServiceError> => sew(async () => {
     return await withAuth(async (userId) => {
         return await withOrgMembership(userId, domain, async ({ org }) => {
             const repo = await prisma.repo.findUnique({
@@ -1736,22 +1736,6 @@ export const getRepoImage = async (repoId: number, domain: string): Promise<Resp
                 return notFound();
             }
 
-            // Only proxy images from self-hosted instances that might require authentication
-            const imageUrl = new URL(repo.imageUrl);
-
-            const publicHostnames = [
-                'github.com',
-                'gitlab.com',
-                'avatars.githubusercontent.com',
-                'gitea.com',
-                'bitbucket.org',
-            ];
-            const isPublicInstance = publicHostnames.includes(imageUrl.hostname);
-
-            if (isPublicInstance) {
-                return Response.redirect(repo.imageUrl);
-            }
-
             let authHeaders: Record<string, string> = {};
             for (const { connection } of repo.connections) {
                 try {
@@ -1766,7 +1750,7 @@ export const getRepoImage = async (repoId: number, domain: string): Promise<Resp
                         const config = connection.config as unknown as GitlabConnectionConfig;
                         if (config.token) {
                             const token = await getTokenFromConfig(config.token, connection.orgId, prisma);
-                            authHeaders['Authorization'] = `Bearer ${token}`;
+                            authHeaders['PRIVATE-TOKEN'] = token;
                             break;
                         }
                     } else if (connection.connectionType === 'gitea') {
@@ -1792,15 +1776,8 @@ export const getRepoImage = async (repoId: number, domain: string): Promise<Resp
                     return notFound();
                 }
 
-                const contentType = response.headers.get('content-type') || 'image/png';
                 const imageBuffer = await response.arrayBuffer();
-
-                return new Response(imageBuffer, {
-                    headers: {
-                        'Content-Type': contentType,
-                        'Cache-Control': 'public, max-age=3600',
-                    },
-                });
+                return imageBuffer;
             } catch (error) {
                 logger.error(`Error proxying image for repo ${repoId}:`, error);
                 return notFound();
diff --git a/packages/web/src/app/api/[domain]/repos/[repoId]/image/route.ts b/packages/web/src/app/api/[domain]/repos/[repoId]/image/route.ts
@@ -14,10 +14,14 @@ export async function GET(
     }
 
     const result = await getRepoImage(repoIdNum, domain);
-
     if (isServiceError(result)) {
         return new Response(result.message, { status: result.statusCode });
     }
 
-    return result;
+    return new Response(result, {
+        headers: {
+            'Content-Type': 'image/png',
+            'Cache-Control': 'public, max-age=3600',
+        },
+    });
 } 
diff --git a/packages/web/src/app/layout.tsx b/packages/web/src/app/layout.tsx
@@ -13,6 +13,7 @@ import { getEntitlements } from "@/features/entitlements/server";
 export const metadata: Metadata = {
     title: "Sourcebot",
     description: "Sourcebot",
+    manifest: "/manifest.json",
 };
 
 export default function RootLayout({
@@ -26,9 +27,6 @@ export default function RootLayout({
             // @see : https://github.com/pacocoursey/next-themes?tab=readme-ov-file#with-app
             suppressHydrationWarning
         >
-            <head>
-                <link rel="manifest" href="/manifest.json" />
-            </head>
             <body>
                 <Toaster />
                 <SessionProvider>

Original file line number	Diff line number	Diff line change
`@@ -14,10 +14,14 @@ export async function GET(`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`const result = await getRepoImage(repoIdNum, domain);`
`17`		`-`
`18`	`17`	`if (isServiceError(result)) {`
`19`	`18`	`return new Response(result.message, { status: result.statusCode });`
`20`	`19`	`}`
`21`	`20`
`22`		`- return result;`
	`21`	`+ return new Response(result, {`
	`22`	`+ headers: {`
	`23`	`+ 'Content-Type': 'image/png',`
	`24`	`+ 'Cache-Control': 'public, max-age=3600',`
	`25`	`+ },`
	`26`	`+ });`
`23`	`27`	`}`