misc cleanups and fix ui issues with bitbucket connections

msukkari · msukkari · commit aea39c613be7 · 2025-04-25T11:08:56.000-07:00
diff --git a/packages/backend/src/repoCompileUtils.ts b/packages/backend/src/repoCompileUtils.ts
@@ -337,15 +337,20 @@ export const compileBitbucketConfig = async (
             throw new Error(`No clone links found for server repo ${repo.name}`);
         }
 
+        // In the cloud case we simply fetch the html link and use that as the clone url. For server we
+        // need to fetch the actual clone url
+        if (config.deploymentType === 'cloud') {
+            const htmlLink = repo.links.html as { href: string };
+            return htmlLink.href;
+        }
+
         const cloneLinks = repo.links.clone as {
             href: string;
             name: string;
         }[];
 
-        // Annoying difference between server and cloud (happens even if server is hosted with https)
-        const targetCloneType = config.deploymentType === 'cloud' ? 'https' : 'http';
         for (const link of cloneLinks) {
-            if (link.name === targetCloneType) {
+            if (link.name === 'http') {
                 return link.href;
             }
         }
@@ -374,7 +379,7 @@ export const compileBitbucketConfig = async (
 
     const repos = bitbucketRepos.map((repo) => {
         const isServer = config.deploymentType === 'server';
-        const codeHostType = isServer ? 'bitbucket-server' : 'bitbucket-cloud';
+        const codeHostType = isServer ? 'bitbucket-server' : 'bitbucket-cloud'; // zoekt expects bitbucket-server
         const displayName = isServer ? (repo as BitbucketServerRepository).name! : (repo as BitbucketCloudRepository).full_name!;
         const externalId = isServer ? (repo as BitbucketServerRepository).id!.toString() : (repo as BitbucketCloudRepository).uuid!;
         const isPublic = isServer ? (repo as BitbucketServerRepository).public : (repo as BitbucketCloudRepository).is_private === false;
diff --git a/packages/backend/src/repoManager.ts b/packages/backend/src/repoManager.ts
@@ -181,8 +181,8 @@ export class RepoManager implements IRepoManager {
             switch (repo.external_codeHostType) {
                 case 'gitlab':
                     return 'oauth2';
-                case 'bitbucket-server':
                 case 'bitbucket-cloud':
+                case 'bitbucket-server':
                 case 'github':
                 case 'gitea':
                 default:
diff --git a/packages/web/src/actions.ts b/packages/web/src/actions.ts
@@ -7,7 +7,7 @@ import { notAuthenticated, notFound, ServiceError, unexpectedError, orgInvalidSu
 import { prisma } from "@/prisma";
 import { StatusCodes } from "http-status-codes";
 import { ErrorCode } from "@/lib/errorCodes";
-import { isServiceError } from "@/lib/utils";
+import { CodeHostType, isServiceError } from "@/lib/utils";
 import { githubSchema } from "@sourcebot/schemas/v3/github.schema";
 import { gitlabSchema } from "@sourcebot/schemas/v3/gitlab.schema";
 import { giteaSchema } from "@sourcebot/schemas/v3/gitea.schema";
@@ -444,10 +444,10 @@ export const getRepos = async (domain: string, filter: { status?: RepoIndexingSt
         }
         ), /* allowSingleTenantUnauthedAccess = */ true));
 
-export const createConnection = async (name: string, type: string, connectionConfig: string, domain: string): Promise<{ id: number } | ServiceError> => sew(() =>
+export const createConnection = async (name: string, type: CodeHostType, connectionConfig: string, domain: string): Promise<{ id: number } | ServiceError> => sew(() =>
     withAuth((session) =>
         withOrgMembership(session, domain, async ({ orgId }) => {
-            const parsedConfig = parseConnectionConfig(type, connectionConfig);
+            const parsedConfig = parseConnectionConfig(connectionConfig);
             if (isServiceError(parsedConfig)) {
                 return parsedConfig;
             }
@@ -533,7 +533,7 @@ export const updateConnectionConfigAndScheduleSync = async (connectionId: number
                 return notFound();
             }
 
-            const parsedConfig = parseConnectionConfig(connection.connectionType, config);
+            const parsedConfig = parseConnectionConfig(config);
             if (isServiceError(parsedConfig)) {
                 return parsedConfig;
             }
@@ -1476,7 +1476,7 @@ const _fetchSubscriptionForOrg = async (orgId: number, prisma: Prisma.Transactio
     return subscriptions.data[0];
 }
 
-const parseConnectionConfig = (connectionType: string, config: string) => {
+const parseConnectionConfig = (config: string) => {
     let parsedConfig: ConnectionConfig;
     try {
         parsedConfig = JSON.parse(config);
@@ -1488,6 +1488,7 @@ const parseConnectionConfig = (connectionType: string, config: string) => {
         } satisfies ServiceError;
     }
 
+    const connectionType = parsedConfig.type;
     const schema = (() => {
         switch (connectionType) {
             case "github":
@@ -1529,7 +1530,7 @@ const parseConnectionConfig = (connectionType: string, config: string) => {
     }
 
     const { numRepos, hasToken } = (() => {
-        switch (parsedConfig.type) {
+        switch (connectionType) {
             case "gitea":
             case "github": 
             case "bitbucket": {
diff --git a/packages/web/src/app/[domain]/components/connectionCreationForms/bitbucketCloudConnectionCreationForm.tsx b/packages/web/src/app/[domain]/components/connectionCreationForms/bitbucketCloudConnectionCreationForm.tsx
@@ -35,7 +35,7 @@ export const BitbucketCloudConnectionCreationForm = ({ onCreated }: BitbucketClo
 
     return (
         <SharedConnectionCreationForm<BitbucketConnectionConfig>
-            type="bitbucket"
+            type="bitbucket-cloud"
             title="Create a Bitbucket Cloud connection"
             defaultValues={{
                 config: JSON.stringify(defaultConfig, null, 2),
diff --git a/packages/web/src/app/[domain]/components/connectionCreationForms/bitbucketDataCenterConnectionCreationForm.tsx b/packages/web/src/app/[domain]/components/connectionCreationForms/bitbucketDataCenterConnectionCreationForm.tsx
@@ -34,7 +34,7 @@ export const BitbucketDataCenterConnectionCreationForm = ({ onCreated }: Bitbuck
 
     return (
         <SharedConnectionCreationForm<BitbucketConnectionConfig>
-            type="bitbucket"
+            type="bitbucket-server"
             title="Create a Bitbucket Data Center connection"
             defaultValues={{
                 config: JSON.stringify(defaultConfig, null, 2),
diff --git a/packages/web/src/app/[domain]/components/importSecretDialog.tsx b/packages/web/src/app/[domain]/components/importSecretDialog.tsx
@@ -88,6 +88,10 @@ export const ImportSecretDialog = ({ open, onOpenChange, onSecretCreated, codeHo
                 return <GitHubPATCreationStep step={1} />;
             case 'gitlab':
                 return <GitLabPATCreationStep step={1} />;
+            case 'bitbucket-cloud':
+                return <BitbucketCloudPATCreationStep step={1} />;
+            case 'bitbucket-server':
+                return <BitbucketServerPATCreationStep step={1} />;
             case 'gitea':
                 return <GiteaPATCreationStep step={1} />;
             case 'gerrit':
@@ -179,7 +183,7 @@ export const ImportSecretDialog = ({ open, onOpenChange, onSecretCreated, codeHo
                                         <FormLabel>Key</FormLabel>
                                         <FormControl>
                                             <Input
-                                                placeholder="my-github-token"
+                                                placeholder="my-access-token"
                                                 {...field}
                                             />
                                         </FormControl>
@@ -262,11 +266,33 @@ const GiteaPATCreationStep = ({ step }: { step: number }) => {
     )
 }
 
+const BitbucketCloudPATCreationStep = ({ step }: { step: number }) => {
+    return (
+        <SecretCreationStep
+            step={step}
+            title="Create an Access Token"
+            description=<span>Please check out our <Link href="https://docs.sourcebot.dev/docs/connections/bitbucket-cloud#authenticating-with-bitbucket-cloud" target="_blank" className="underline">docs</Link> for more information on how to create auth credentials for Bitbucket Cloud.</span>
+        >
+        </SecretCreationStep>
+    )
+}
+
+const BitbucketServerPATCreationStep = ({ step }: { step: number }) => {
+    return (
+        <SecretCreationStep
+            step={step}
+            title="Create an Access Token"
+            description=<span>Please check out our <Link href="https://docs.sourcebot.dev/docs/connections/bitbucket-data-center#authenticating-with-bitbucket-data-center" target="_blank" className="underline">docs</Link> for more information on how to create auth credentials for Bitbucket Data Center.</span>
+        >
+        </SecretCreationStep>
+    )
+}
+
 interface SecretCreationStepProps {
     step: number;
     title: string;
     description: string | React.ReactNode;
-    children: React.ReactNode;
+    children?: React.ReactNode;
 }
 
 const SecretCreationStep = ({ step, title, description, children }: SecretCreationStepProps) => {
diff --git a/packages/web/src/app/[domain]/connections/[id]/components/configSetting.tsx b/packages/web/src/app/[domain]/connections/[id]/components/configSetting.tsx
@@ -13,7 +13,7 @@ import { createZodConnectionConfigValidator } from "../../utils";
 import { GithubConnectionConfig } from "@sourcebot/schemas/v3/github.type";
 import { GiteaConnectionConfig } from "@sourcebot/schemas/v3/gitea.type";
 import { GerritConnectionConfig } from "@sourcebot/schemas/v3/gerrit.type";
-import { githubQuickActions, gitlabQuickActions, giteaQuickActions, gerritQuickActions } from "../../quickActions";
+import { githubQuickActions, gitlabQuickActions, giteaQuickActions, gerritQuickActions, bitbucketCloudQuickActions, bitbucketDataCenterQuickActions } from "../../quickActions";
 import { Schema } from "ajv";
 import { GitlabConnectionConfig } from "@sourcebot/schemas/v3/gitlab.type";
 import { gitlabSchema } from "@sourcebot/schemas/v3/gitlab.schema";
@@ -27,11 +27,13 @@ import { useDomain } from "@/hooks/useDomain";
 import { SecretCombobox } from "@/app/[domain]/components/connectionCreationForms/secretCombobox";
 import { ReactCodeMirrorRef } from "@uiw/react-codemirror";
 import strings from "@/lib/strings";
+import { bitbucketSchema } from "@sourcebot/schemas/v3/bitbucket.schema";
+import { BitbucketConnectionConfig } from "@sourcebot/schemas/v3/bitbucket.type";
 
 interface ConfigSettingProps {
     connectionId: number;
     config: string;
-    type: string;
+    type: CodeHostType;
     disabled?: boolean;
 }
 
@@ -56,6 +58,24 @@ export const ConfigSetting = (props: ConfigSettingProps) => {
         />;
     }
 
+    if (type === 'bitbucket-cloud') {
+        return <ConfigSettingInternal<BitbucketConnectionConfig>
+            {...props}
+            type="bitbucket-cloud"
+            quickActions={bitbucketCloudQuickActions}
+            schema={bitbucketSchema}
+        />;
+    }
+
+    if (type === 'bitbucket-server') {
+        return <ConfigSettingInternal<BitbucketConnectionConfig>
+            {...props}
+            type="bitbucket-server"
+            quickActions={bitbucketDataCenterQuickActions}
+            schema={bitbucketSchema}
+        />;
+    }
+
     if (type === 'gitea') {
         return <ConfigSettingInternal<GiteaConnectionConfig>
             {...props}
diff --git a/packages/web/src/app/[domain]/connections/[id]/page.tsx b/packages/web/src/app/[domain]/connections/[id]/page.tsx
@@ -21,6 +21,9 @@ import { getOrgMembership } from "@/actions"
 import { isServiceError } from "@/lib/utils"
 import { notFound } from "next/navigation"
 import { OrgRole } from "@sourcebot/db"
+import { CodeHostType } from "@/lib/utils"
+import { BitbucketConnectionConfig } from "@sourcebot/schemas/v3/bitbucket.type"
+
 interface ConnectionManagementPageProps {
     params: {
         domain: string
diff --git a/packages/web/src/app/[domain]/connections/components/newConnectionCard.tsx b/packages/web/src/app/[domain]/connections/components/newConnectionCard.tsx
@@ -56,7 +56,7 @@ export const NewConnectionCard = ({ className, role }: NewConnectionCardProps) =
                     disabled={!isOwner}
                 />
                 <Card
-                    type="bitbucket-data-center"
+                    type="bitbucket-server"
                     title="Bitbucket Data Center"
                     subtitle="Fetch repos from a Bitbucket DC instance."
                     disabled={!isOwner}
diff --git a/packages/web/src/app/[domain]/connections/new/[type]/page.tsx b/packages/web/src/app/[domain]/connections/new/[type]/page.tsx
@@ -43,7 +43,7 @@ export default function NewConnectionPage({
         return <BitbucketCloudConnectionCreationForm onCreated={onCreated} />;
     }
 
-    if (type === 'bitbucket-data-center') {
+    if (type === 'bitbucket-server') {
         return <BitbucketDataCenterConnectionCreationForm onCreated={onCreated} />;
     }
     
diff --git a/packages/web/src/app/[domain]/onboard/components/connectCodeHost.tsx b/packages/web/src/app/[domain]/onboard/components/connectCodeHost.tsx
@@ -90,7 +90,7 @@ export const ConnectCodeHost = ({ nextStep, securityCardEnabled }: ConnectCodeHo
         )
     }
 
-    if (selectedCodeHost === "bitbucket-data-center") {
+    if (selectedCodeHost === "bitbucket-server") {
         return (
             <>
                 <BackButton onClick={onBack} />
@@ -129,18 +129,18 @@ const CodeHostSelection = ({ onSelect }: CodeHostSelectionProps) => {
             />
             <CodeHostIconButton
                 name="Bitbucket Cloud"
-                logo={getCodeHostIcon("bitbucket")!}
+                logo={getCodeHostIcon("bitbucket-cloud")!}
                 onClick={() => {
                     onSelect("bitbucket-cloud");
                     captureEvent("wa_onboard_bitbucket_cloud_selected", {});
                 }}
             />
             <CodeHostIconButton
                 name="Bitbucket DC"
-                logo={getCodeHostIcon("bitbucket")!}
+                logo={getCodeHostIcon("bitbucket-server")!}
                 onClick={() => {
-                    onSelect("bitbucket-data-center");
-                    captureEvent("wa_onboard_bitbucket_data_center_selected", {});
+                    onSelect("bitbucket-server");
+                    captureEvent("wa_onboard_bitbucket_server_selected", {});
                 }}
             />
             <CodeHostIconButton
diff --git a/packages/web/src/lib/posthogEvents.ts b/packages/web/src/lib/posthogEvents.ts
@@ -239,7 +239,7 @@ export type PosthogEventMap = {
     wa_onboard_gitea_selected: {},
     wa_onboard_gerrit_selected: {},
     wa_onboard_bitbucket_cloud_selected: {},
-    wa_onboard_bitbucket_data_center_selected: {},
+    wa_onboard_bitbucket_server_selected: {},
     //////////////////////////////////////////////////////////////////
     wa_security_page_click: {},
     //////////////////////////////////////////////////////////////////
diff --git a/packages/web/src/lib/utils.ts b/packages/web/src/lib/utils.ts
@@ -32,7 +32,7 @@ export const createPathWithQueryParams = (path: string, ...queryParams: [string,
     return `${path}?${queryString}`;
 }
 
-export type CodeHostType = "github" | "gitlab" | "gitea" | "gerrit" | "bitbucket" | "bitbucket-cloud" | "bitbucket-data-center";
+export type CodeHostType = "github" | "gitlab" | "gitea" | "gerrit" | "bitbucket-cloud" | "bitbucket-server";
 
 type CodeHostInfo = {
     type: CodeHostType;
@@ -111,11 +111,21 @@ const _getCodeHostInfoInternal = (type: string, displayName: string, cloneUrl: s
                 iconClassName: className,
             }
         }
-        case "bitbucket-server": 
+        case "bitbucket-server": {
+            const { src, className } = getCodeHostIcon('bitbucket-server')!;
+            return {
+                type: "bitbucket-server",
+                displayName: displayName,
+                codeHostName: "Bitbucket",
+                repoLink: cloneUrl,
+                icon: src,
+                iconClassName: className,
+            }
+        }
         case "bitbucket-cloud": {
-            const { src, className } = getCodeHostIcon('bitbucket')!;
+            const { src, className } = getCodeHostIcon('bitbucket-cloud')!;
             return {
-                type: "bitbucket",
+                type: "bitbucket-cloud",
                 displayName: displayName,
                 codeHostName: "Bitbucket",
                 repoLink: cloneUrl,
@@ -145,9 +155,8 @@ export const getCodeHostIcon = (codeHostType: CodeHostType): { src: string, clas
             return {
                 src: gerritLogo,
             }
-        case "bitbucket":
         case "bitbucket-cloud":
-        case "bitbucket-data-center":
+        case "bitbucket-server":
             return {
                 src: bitbucketLogo,
             }
@@ -161,9 +170,8 @@ export const isAuthSupportedForCodeHost = (codeHostType: CodeHostType): boolean
         case "github":
         case "gitlab":
         case "gitea":
-        case "bitbucket":
         case "bitbucket-cloud":
-        case "bitbucket-data-center":
+        case "bitbucket-server":
             return true;
         case "gerrit":
             return false;

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ export default function NewConnectionPage({`
`43`	`43`	`return <BitbucketCloudConnectionCreationForm onCreated={onCreated} />;`
`44`	`44`	`}`
`45`	`45`
`46`		`- if (type === 'bitbucket-data-center') {`
	`46`	`+ if (type === 'bitbucket-server') {`
`47`	`47`	`return <BitbucketDataCenterConnectionCreationForm onCreated={onCreated} />;`
`48`	`48`	`}`
`49`	`49`