diff --git a/package.json b/package.json index 69e18a11..d79edcf1 100644 --- a/package.json +++ b/package.json @@ -7,9 +7,11 @@ "build": "yarn workspaces run build", "test": "yarn workspaces run test", "dev": "cross-env SOURCEBOT_TENANT_MODE=single npm-run-all --print-label dev:start", - "dev:mt": "cross-env SOURCEBOT_TENANT_MODE=multi npm-run-all --print-label dev:start", + "dev:mt": "cross-env SOURCEBOT_TENANT_MODE=multi npm-run-all --print-label dev:start:mt", "dev:start": "yarn workspace @sourcebot/db prisma:migrate:dev && cross-env npm-run-all --print-label --parallel dev:zoekt dev:backend dev:web", + "dev:start:mt": "yarn workspace @sourcebot/db prisma:migrate:dev && cross-env npm-run-all --print-label --parallel dev:zoekt:mt dev:backend dev:web", "dev:zoekt": "export PATH=\"$PWD/bin:$PATH\" && export SRC_TENANT_ENFORCEMENT_MODE=none && zoekt-webserver -index .sourcebot/index -rpc", + "dev:zoekt:mt": "export PATH=\"$PWD/bin:$PATH\" && export SRC_TENANT_ENFORCEMENT_MODE=strict && zoekt-webserver -index .sourcebot/index -rpc", "dev:backend": "yarn workspace @sourcebot/backend dev:watch", "dev:web": "yarn workspace @sourcebot/web dev" }, diff --git a/packages/web/src/actions.ts b/packages/web/src/actions.ts index ab4c3f9f..64798d54 100644 --- a/packages/web/src/actions.ts +++ b/packages/web/src/actions.ts @@ -1,12 +1,12 @@ 'use server'; import Ajv from "ajv"; -import { getUser } from "./data/user"; -import { auth } from "./auth"; -import { notAuthenticated, notFound, ServiceError, unexpectedError } from "./lib/serviceError"; +import { auth, getCurrentUserOrg } from "./auth"; +import { notAuthenticated, notFound, ServiceError, unexpectedError } from "@/lib/serviceError"; import { prisma } from "@/prisma"; import { StatusCodes } from "http-status-codes"; -import { ErrorCode } from "./lib/errorCodes"; +import { ErrorCode } from "@/lib/errorCodes"; +import { isServiceError } from "@/lib/utils"; import { githubSchema } from "@sourcebot/schemas/v3/github.schema"; import { encrypt } from "@sourcebot/crypto" @@ -15,31 +15,9 @@ const ajv = new Ajv({ }); export const createSecret = async (key: string, value: string): Promise<{ success: boolean } | ServiceError> => { - const session = await auth(); - if (!session) { - return notAuthenticated(); - } - - const user = await getUser(session.user.id); - if (!user) { - return unexpectedError("User not found"); - } - const orgId = user.activeOrgId; - if (!orgId) { - return unexpectedError("User has no active org"); - } - - // @todo: refactor this into a shared function - const membership = await prisma.userToOrg.findUnique({ - where: { - orgId_userId: { - userId: session.user.id, - orgId, - } - }, - }); - if (!membership) { - return notFound(); + const orgId = await getCurrentUserOrg(); + if (isServiceError(orgId)) { + return orgId; } try { @@ -62,30 +40,9 @@ export const createSecret = async (key: string, value: string): Promise<{ succes } export const getSecrets = async (): Promise<{ createdAt: Date; key: string; }[] | ServiceError> => { - const session = await auth(); - if (!session) { - return notAuthenticated(); - } - - const user = await getUser(session.user.id); - if (!user) { - return unexpectedError("User not found"); - } - const orgId = user.activeOrgId; - if (!orgId) { - return unexpectedError("User has no active org"); - } - - const membership = await prisma.userToOrg.findUnique({ - where: { - orgId_userId: { - userId: session.user.id, - orgId, - } - }, - }); - if (!membership) { - return notFound(); + const orgId = await getCurrentUserOrg(); + if (isServiceError(orgId)) { + return orgId; } const secrets = await prisma.secret.findMany({ @@ -105,30 +62,9 @@ export const getSecrets = async (): Promise<{ createdAt: Date; key: string; }[] } export const deleteSecret = async (key: string): Promise<{ success: boolean } | ServiceError> => { - const session = await auth(); - if (!session) { - return notAuthenticated(); - } - - const user = await getUser(session.user.id); - if (!user) { - return unexpectedError("User not found"); - } - const orgId = user.activeOrgId; - if (!orgId) { - return unexpectedError("User has no active org"); - } - - const membership = await prisma.userToOrg.findUnique({ - where: { - orgId_userId: { - userId: session.user.id, - orgId, - } - }, - }); - if (!membership) { - return notFound(); + const orgId = await getCurrentUserOrg(); + if (isServiceError(orgId)) { + return orgId; } await prisma.secret.delete({ @@ -206,31 +142,9 @@ export const switchActiveOrg = async (orgId: number): Promise<{ id: number } | S } export const createConnection = async (config: string): Promise<{ id: number } | ServiceError> => { - const session = await auth(); - if (!session) { - return notAuthenticated(); - } - - const user = await getUser(session.user.id); - if (!user) { - return unexpectedError("User not found"); - } - const orgId = user.activeOrgId; - if (!orgId) { - return unexpectedError("User has no active org"); - } - - // @todo: refactor this into a shared function - const membership = await prisma.userToOrg.findUnique({ - where: { - orgId_userId: { - userId: session.user.id, - orgId, - } - }, - }); - if (!membership) { - return notFound(); + const orgId = await getCurrentUserOrg(); + if (isServiceError(orgId)) { + return orgId; } let parsedConfig; diff --git a/packages/web/src/app/api/(server)/repos/route.ts b/packages/web/src/app/api/(server)/repos/route.ts index def073c1..eac6d2e3 100644 --- a/packages/web/src/app/api/(server)/repos/route.ts +++ b/packages/web/src/app/api/(server)/repos/route.ts @@ -1,8 +1,15 @@ 'use server'; import { listRepositories } from "@/lib/server/searchService"; +import { getCurrentUserOrg } from "../../../../auth"; +import { isServiceError } from "@/lib/utils"; export const GET = async () => { - const response = await listRepositories(); + const orgId = await getCurrentUserOrg(); + if (isServiceError(orgId)) { + return orgId; + } + + const response = await listRepositories(orgId); return Response.json(response); } \ No newline at end of file diff --git a/packages/web/src/app/api/(server)/search/route.ts b/packages/web/src/app/api/(server)/search/route.ts index 4255d33c..7301fc9c 100644 --- a/packages/web/src/app/api/(server)/search/route.ts +++ b/packages/web/src/app/api/(server)/search/route.ts @@ -5,19 +5,17 @@ import { searchRequestSchema } from "@/lib/schemas"; import { schemaValidationError, serviceErrorResponse } from "@/lib/serviceError"; import { isServiceError } from "@/lib/utils"; import { NextRequest } from "next/server"; +import { getCurrentUserOrg } from "../../../../auth"; export const POST = async (request: NextRequest) => { + const orgId = await getCurrentUserOrg(); + if (isServiceError(orgId)) { + return orgId; + } + + console.log(`Searching for org ${orgId}`); const body = await request.json(); - const tenantId = request.headers.get("X-Tenant-ID"); - - console.log(`Search request received. Tenant ID: ${tenantId}`); - - const parsed = await searchRequestSchema.safeParseAsync({ - ...body, - ...(tenantId ? { - tenantId: parseInt(tenantId) - } : {}), - }); + const parsed = await searchRequestSchema.safeParseAsync(body); if (!parsed.success) { return serviceErrorResponse( schemaValidationError(parsed.error) @@ -25,7 +23,7 @@ export const POST = async (request: NextRequest) => { } - const response = await search(parsed.data); + const response = await search(parsed.data, orgId); if (isServiceError(response)) { return serviceErrorResponse(response); } diff --git a/packages/web/src/app/api/(server)/source/route.ts b/packages/web/src/app/api/(server)/source/route.ts index 2c245374..d171a6c4 100644 --- a/packages/web/src/app/api/(server)/source/route.ts +++ b/packages/web/src/app/api/(server)/source/route.ts @@ -5,8 +5,14 @@ import { getFileSource } from "@/lib/server/searchService"; import { schemaValidationError, serviceErrorResponse } from "@/lib/serviceError"; import { isServiceError } from "@/lib/utils"; import { NextRequest } from "next/server"; +import { getCurrentUserOrg } from "@/auth"; export const POST = async (request: NextRequest) => { + const orgId = await getCurrentUserOrg(); + if (isServiceError(orgId)) { + return orgId; + } + const body = await request.json(); const parsed = await fileSourceRequestSchema.safeParseAsync(body); if (!parsed.success) { @@ -15,7 +21,7 @@ export const POST = async (request: NextRequest) => { ); } - const response = await getFileSource(parsed.data); + const response = await getFileSource(parsed.data, orgId); if (isServiceError(response)) { return serviceErrorResponse(response); } diff --git a/packages/web/src/app/browse/[...path]/page.tsx b/packages/web/src/app/browse/[...path]/page.tsx index 47108622..010efd01 100644 --- a/packages/web/src/app/browse/[...path]/page.tsx +++ b/packages/web/src/app/browse/[...path]/page.tsx @@ -7,6 +7,7 @@ import { CodePreview } from "./codePreview"; import { PageNotFound } from "@/app/components/pageNotFound"; import { ErrorCode } from "@/lib/errorCodes"; import { LuFileX2, LuBookX } from "react-icons/lu"; +import { getCurrentUserOrg } from "@/auth"; interface BrowsePageProps { params: { @@ -44,9 +45,18 @@ export default async function BrowsePage({ } })(); + const orgId = await getCurrentUserOrg(); + if (isServiceError(orgId)) { + return ( + <> + Error: {orgId.message} + + ) + } + // @todo (bkellam) : We should probably have a endpoint to fetch repository metadata // given it's name or id. - const reposResponse = await listRepositories(); + const reposResponse = await listRepositories(orgId); if (isServiceError(reposResponse)) { // @todo : proper error handling return ( @@ -98,6 +108,7 @@ export default async function BrowsePage({ path={path} repoName={repoName} revisionName={revisionName ?? 'HEAD'} + orgId={orgId} /> )} @@ -108,19 +119,21 @@ interface CodePreviewWrapper { path: string, repoName: string, revisionName: string, + orgId: number, } const CodePreviewWrapper = async ({ path, repoName, revisionName, + orgId, }: CodePreviewWrapper) => { // @todo: this will depend on `pathType`. const fileSourceResponse = await getFileSource({ fileName: path, repository: repoName, branch: revisionName, - }); + }, orgId); if (isServiceError(fileSourceResponse)) { if (fileSourceResponse.errorCode === ErrorCode.FILE_NOT_FOUND) { diff --git a/packages/web/src/app/page.tsx b/packages/web/src/app/page.tsx index 81c19628..335a4754 100644 --- a/packages/web/src/app/page.tsx +++ b/packages/web/src/app/page.tsx @@ -11,93 +11,102 @@ import { Separator } from "@/components/ui/separator"; import { SymbolIcon } from "@radix-ui/react-icons"; import { UpgradeToast } from "./components/upgradeToast"; import Link from "next/link"; +import { getCurrentUserOrg } from "../auth" export default async function Home() { + const orgId = await getCurrentUserOrg(); + return (
-
-
- {"Sourcebot - {"Sourcebot + {isServiceError(orgId) ? ( +
+ You are not authenticated. Please log in to continue.
- -
- ...
}> - - -
-
- - How to search -
- - - test todo (both test and todo) - - - test or todo (either test or todo) - - - {`"exit boot"`} (exact match) - - - TODO case:yes (case sensitive) - - - - - file:README setup (by filename) - - - repo:torvalds/linux test (by repo) - - - lang:typescript (by language) - - - rev:HEAD (by branch or tag) - - - - - file:{`\\.py$`} {`(files that end in ".py")`} - - - sym:main {`(symbols named "main")`} - - - todo -lang:c (negate filter) - - - content:README (search content only) - - + ) : ( +
+
+ {"Sourcebot + {"Sourcebot +
+ +
+ ...
}> + + +
+
+ + How to search +
+ + + test todo (both test and todo) + + + test or todo (either test or todo) + + + {`"exit boot"`} (exact match) + + + TODO case:yes (case sensitive) + + + + + file:README setup (by filename) + + + repo:torvalds/linux test (by repo) + + + lang:typescript (by language) + + + rev:HEAD (by branch or tag) + + + + + file:{`\\.py$`} {`(files that end in ".py")`} + + + sym:main {`(symbols named "main")`} + + + todo -lang:c (negate filter) + + + content:README (search content only) + + +
-
+ )}
About @@ -110,8 +119,8 @@ export default async function Home() { ) } -const RepositoryList = async () => { - const _repos = await listRepositories(); +const RepositoryList = async ({ orgId }: { orgId: number}) => { + const _repos = await listRepositories(orgId); if (isServiceError(_repos)) { return null; diff --git a/packages/web/src/app/repos/page.tsx b/packages/web/src/app/repos/page.tsx index 7da11dd4..3bcd39c7 100644 --- a/packages/web/src/app/repos/page.tsx +++ b/packages/web/src/app/repos/page.tsx @@ -1,14 +1,25 @@ import { Suspense } from "react"; import { NavigationMenu } from "../components/navigationMenu"; import { RepositoryTable } from "./repositoryTable"; +import { getCurrentUserOrg } from "@/auth"; +import { isServiceError } from "@/lib/utils"; -export default function ReposPage() { +export default async function ReposPage() { + const orgId = await getCurrentUserOrg(); + if (isServiceError(orgId)) { + return ( + <> + Error: {orgId.message} + + ) + } + return (
Loading...
}>
- +
diff --git a/packages/web/src/app/repos/repositoryTable.tsx b/packages/web/src/app/repos/repositoryTable.tsx index b6a185a1..47b96080 100644 --- a/packages/web/src/app/repos/repositoryTable.tsx +++ b/packages/web/src/app/repos/repositoryTable.tsx @@ -3,8 +3,8 @@ import { columns, RepositoryColumnInfo } from "./columns"; import { listRepositories } from "@/lib/server/searchService"; import { isServiceError } from "@/lib/utils"; -export const RepositoryTable = async () => { - const _repos = await listRepositories(); +export const RepositoryTable = async ({ orgId }: { orgId: number }) => { + const _repos = await listRepositories(orgId); if (isServiceError(_repos)) { return
Error fetching repositories
; diff --git a/packages/web/src/app/secrets/page.tsx b/packages/web/src/app/secrets/page.tsx index 0a594873..168d553d 100644 --- a/packages/web/src/app/secrets/page.tsx +++ b/packages/web/src/app/secrets/page.tsx @@ -1,6 +1,6 @@ import { NavigationMenu } from "../components/navigationMenu"; import { SecretsTable } from "./secretsTable"; -import { getSecrets, createSecret } from "../../actions" +import { getSecrets } from "../../actions" import { isServiceError } from "@/lib/utils"; export interface SecretsTableProps { diff --git a/packages/web/src/auth.ts b/packages/web/src/auth.ts index 128822a9..2523957c 100644 --- a/packages/web/src/auth.ts +++ b/packages/web/src/auth.ts @@ -6,6 +6,8 @@ import { prisma } from "@/prisma"; import type { Provider } from "next-auth/providers" import { AUTH_GITHUB_CLIENT_ID, AUTH_GITHUB_CLIENT_SECRET, AUTH_SECRET } from "./lib/environment"; import { User } from '@sourcebot/db'; +import { notAuthenticated, notFound, unexpectedError } from "@/lib/serviceError"; +import { getUser } from "./data/user"; declare module 'next-auth' { interface Session { @@ -116,3 +118,33 @@ export const { handlers, signIn, signOut, auth } = NextAuth({ signIn: "/login" } }); + +export const getCurrentUserOrg = async () => { + const session = await auth(); + if (!session) { + return notAuthenticated(); + } + + const user = await getUser(session.user.id); + if (!user) { + return unexpectedError("User not found"); + } + const orgId = user.activeOrgId; + if (!orgId) { + return unexpectedError("User has no active org"); + } + + const membership = await prisma.userToOrg.findUnique({ + where: { + orgId_userId: { + userId: session.user.id, + orgId, + } + }, + }); + if (!membership) { + return notFound(); + } + + return orgId; +} diff --git a/packages/web/src/lib/schemas.ts b/packages/web/src/lib/schemas.ts index edfe4eb1..d9d4b46f 100644 --- a/packages/web/src/lib/schemas.ts +++ b/packages/web/src/lib/schemas.ts @@ -4,7 +4,6 @@ export const searchRequestSchema = z.object({ query: z.string(), maxMatchDisplayCount: z.number(), whole: z.boolean().optional(), - tenantId: z.number().optional(), }); diff --git a/packages/web/src/lib/server/searchService.ts b/packages/web/src/lib/server/searchService.ts index 933ca99a..b6353b9b 100644 --- a/packages/web/src/lib/server/searchService.ts +++ b/packages/web/src/lib/server/searchService.ts @@ -34,7 +34,7 @@ const aliasPrefixMappings: Record = { "revision:": zoektPrefixes.branch, } -export const search = async ({ query, maxMatchDisplayCount, whole, tenantId }: SearchRequest): Promise => { +export const search = async ({ query, maxMatchDisplayCount, whole}: SearchRequest, orgId: number): Promise => { // Replace any alias prefixes with their corresponding zoekt prefixes. for (const [prefix, zoektPrefix] of Object.entries(aliasPrefixMappings)) { query = query.replaceAll(prefix, zoektPrefix); @@ -54,11 +54,9 @@ export const search = async ({ query, maxMatchDisplayCount, whole, tenantId }: S }); let header: Record = {}; - if (tenantId) { - header = { - "X-Tenant-ID": tenantId.toString() - }; - } + header = { + "X-Tenant-ID": orgId.toString() + }; const searchResponse = await zoektFetch({ path: "/api/search", @@ -92,7 +90,7 @@ export const search = async ({ query, maxMatchDisplayCount, whole, tenantId }: S // @todo (bkellam) : We should really be using `git show :` to fetch file contents here. // This will allow us to support permalinks to files at a specific revision that may not be indexed // by zoekt. -export const getFileSource = async ({ fileName, repository, branch }: FileSourceRequest): Promise => { +export const getFileSource = async ({ fileName, repository, branch }: FileSourceRequest, orgId: number): Promise => { const escapedFileName = escapeStringRegexp(fileName); const escapedRepository = escapeStringRegexp(repository); @@ -105,7 +103,7 @@ export const getFileSource = async ({ fileName, repository, branch }: FileSource query, maxMatchDisplayCount: 1, whole: true, - }); + }, orgId); if (isServiceError(searchResponse)) { return searchResponse; @@ -126,15 +124,22 @@ export const getFileSource = async ({ fileName, repository, branch }: FileSource } } -export const listRepositories = async (): Promise => { +export const listRepositories = async (orgId: number): Promise => { const body = JSON.stringify({ opts: { Field: 0, } }); + + let header: Record = {}; + header = { + "X-Tenant-ID": orgId.toString() + }; + const listResponse = await zoektFetch({ path: "/api/list", body, + header, method: "POST", cache: "no-store", });