fix(bitbucket): harden provider edge cases

Author: Bill Leoutsakos

apps/sim/app/api/tools/bitbucket/repositories/route.test.ts

@@ -32,7 +32,8 @@ vi.mock('@/lib/oauth/credential-service', () => ({
 import { POST } from '@/app/api/tools/bitbucket/repositories/route'
 
 const URL = 'http://localhost:3000/api/tools/bitbucket/repositories'
-const FIRST_PAGE_URL = 'https://api.bitbucket.org/2.0/repositories/acme-platform?pagelen=100'
+const FIRST_PAGE_URL =
+  'https://api.bitbucket.org/2.0/repositories/acme-platform?pagelen=100&fields=values.slug%2Cvalues.uuid%2Cvalues.name%2Cvalues.full_name%2Cnext'
 const SECOND_PAGE_URL =
   'https://api.bitbucket.org/2.0/repositories/acme-platform?page=2&pagelen=100'
 const REQUEST_BODY = {
@@ -190,7 +191,6 @@ describe('POST /api/tools/bitbucket/repositories', () => {
         values: [
           {
             uuid: '{repository-uuid}',
-            name: 'Payments API',
             full_name: 'acme-platform/payments-api',
             links: { html: { href: 'https://bitbucket.org/acme-platform/payments-api' } },
           },
@@ -214,7 +214,7 @@ describe('POST /api/tools/bitbucket/repositories', () => {
         {
           slug: 'payments-api',
           uuid: '{repository-uuid}',
-          name: 'Payments API',
+          name: 'payments-api',
           fullName: 'acme-platform/payments-api',
         },
       ],

apps/sim/app/api/tools/bitbucket/repositories/route.ts

@@ -19,6 +19,7 @@ export const dynamic = 'force-dynamic'
 const logger = createLogger('BitbucketRepositoriesAPI')
 const BITBUCKET_PROVIDER_ID = 'bitbucket'
 const BITBUCKET_REPOSITORIES_URL = 'https://api.bitbucket.org/2.0/repositories'
+const BITBUCKET_REPOSITORY_FIELDS = 'values.slug,values.uuid,values.name,values.full_name,next'
 const SELECTOR_REQUEST_MAX_BYTES = 8 * 1024
 const PROVIDER_RESPONSE_MAX_BYTES = 1024 * 1024
 
@@ -98,9 +99,10 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
     )
   }
 
-  const providerUrl =
-    cursor ??
-    `${BITBUCKET_REPOSITORIES_URL}/${encodeURIComponent(workspaceSlug)}?pagelen=${BITBUCKET_SELECTOR_PAGE_SIZE}`
+  const firstPage = new URL(`${BITBUCKET_REPOSITORIES_URL}/${encodeURIComponent(workspaceSlug)}`)
+  firstPage.searchParams.set('pagelen', String(BITBUCKET_SELECTOR_PAGE_SIZE))
+  firstPage.searchParams.set('fields', BITBUCKET_REPOSITORY_FIELDS)
+  const providerUrl = cursor ?? firstPage.toString()
 
   let response: Response
   try {
@@ -160,7 +162,7 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
     repositories: page.data.values.map((repository) => ({
       slug: repository.slug,
       uuid: repository.uuid,
-      name: repository.name,
+      name: repository.name ?? repository.slug,
       fullName: repository.full_name,
     })),
     ...(page.data.next ? { nextCursor: page.data.next } : {}),

apps/sim/app/api/tools/bitbucket/workspaces/route.test.ts

@@ -33,7 +33,7 @@ import { POST } from '@/app/api/tools/bitbucket/workspaces/route'
 
 const URL = 'http://localhost:3000/api/tools/bitbucket/workspaces'
 const FIRST_PAGE_URL =
-  'https://api.bitbucket.org/2.0/user/workspaces?pagelen=100&fields=%2Bvalues.workspace.name'
+  'https://api.bitbucket.org/2.0/user/workspaces?pagelen=100&fields=values.administrator%2Cvalues.workspace.slug%2Cvalues.workspace.uuid%2Cvalues.workspace.name%2Cnext'
 const SECOND_PAGE_URL = 'https://api.bitbucket.org/2.0/user/workspaces?page=2&pagelen=100'
 const REQUEST_BODY = { credential: 'credential-1', workflowId: 'workflow-1' } as const
 

apps/sim/app/api/tools/bitbucket/workspaces/route.ts

@@ -19,7 +19,8 @@ export const dynamic = 'force-dynamic'
 const logger = createLogger('BitbucketWorkspacesAPI')
 const BITBUCKET_PROVIDER_ID = 'bitbucket'
 const BITBUCKET_WORKSPACES_URL = 'https://api.bitbucket.org/2.0/user/workspaces'
-const BITBUCKET_WORKSPACE_FIELDS = '+values.workspace.name'
+const BITBUCKET_WORKSPACE_FIELDS =
+  'values.administrator,values.workspace.slug,values.workspace.uuid,values.workspace.name,next'
 const SELECTOR_REQUEST_MAX_BYTES = 8 * 1024
 const PROVIDER_RESPONSE_MAX_BYTES = 1024 * 1024
 
@@ -101,10 +102,6 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
 
   const firstPage = new URL(BITBUCKET_WORKSPACES_URL)
   firstPage.searchParams.set('pagelen', String(BITBUCKET_SELECTOR_PAGE_SIZE))
-  /**
-   * The current endpoint returns a `workspace_base` by default, whose documented
-   * sample omits `name`; additive fields keep the default shape and request it.
-   */
   firstPage.searchParams.set('fields', BITBUCKET_WORKSPACE_FIELDS)
   const providerUrl = cursor ?? firstPage.toString()
 

apps/sim/lib/api/contracts/selectors/bitbucket.ts

@@ -115,7 +115,7 @@ const bitbucketRepositoryProviderSchema = z
   .object({
     slug: bitbucketRepositorySlugSchema.optional(),
     uuid: bitbucketUuidSchema,
-    name: bitbucketNameSchema,
+    name: bitbucketNameSchema.optional(),
     full_name: bitbucketNameSchema,
   })
   .passthrough()

apps/sim/lib/auth/connectors/providers.ts

@@ -1531,22 +1531,32 @@ export function buildConnectorProviders(): GenericOAuthConfig[] {
       },
       getUserInfo: async (tokens) => {
         try {
+          const signal = AbortSignal.timeout(15_000)
           const response = await fetch('https://api.bitbucket.org/2.0/user', {
             headers: {
               Authorization: `Bearer ${tokens.accessToken}`,
             },
+            signal,
           })
 
           if (!response.ok) {
-            await response.text().catch(() => {})
+            await readResponseTextWithLimit(response, {
+              maxBytes: 1024 * 1024,
+              label: 'Bitbucket OAuth user info error response',
+              signal,
+            }).catch(() => {})
             logger.error('Error fetching Bitbucket user info:', {
               status: response.status,
               statusText: response.statusText,
             })
             return null
           }
 
-          const data: BitbucketCurrentUserResponse = await response.json()
+          const data = await readResponseJsonWithLimit<BitbucketCurrentUserResponse>(response, {
+            maxBytes: 1024 * 1024,
+            label: 'Bitbucket OAuth user info response',
+            signal,
+          })
           const stableId = data.account_id ?? data.uuid
           if (!stableId) {
             logger.error('Bitbucket user info did not include an account_id or uuid')

apps/sim/lib/oauth/oauth.test.ts

@@ -209,6 +209,27 @@ describe('Bitbucket OAuth Connector', () => {
     expect(uuidIdentity?.email).toBe('bitbucket-uuid-456@connectors.sim.invalid')
     expect(uuidIdentity?.name).toBe('grace')
   })
+
+  it('bounds Bitbucket user-info responses and supplies a provider deadline', async () => {
+    const getUserInfo = getBitbucketConnector().getUserInfo
+    if (!getUserInfo) throw new Error('Bitbucket connector must define getUserInfo')
+    const mockFetch = vi.fn(async (_url: string, init?: RequestInit) => {
+      expect(init?.signal).toBeInstanceOf(AbortSignal)
+      return new Response('{}', {
+        headers: {
+          'content-length': String(1024 * 1024 + 1),
+          'content-type': 'application/json',
+        },
+      })
+    })
+
+    await expect(
+      withMockFetch(mockFetch, () =>
+        getUserInfo(getOAuth2Tokens({ access_token: 'bitbucket_access_token' }))
+      )
+    ).resolves.toBeNull()
+    expect(mockFetch).toHaveBeenCalledOnce()
+  })
 })
 
 describe('OAuth Provider Branding', () => {

apps/sim/tools/bitbucket/delete_branch.ts

@@ -33,7 +33,12 @@ export const bitbucketDeleteBranchTool: ToolConfig<
     method: 'DELETE',
     headers: (params) => bitbucketHeaders(params.accessToken),
   },
-  transformResponse: async () => ({ success: true, output: { deleted: true } }),
+  transformResponse: async (response) => {
+    if (response.status !== 204) {
+      throw new Error(`Bitbucket branch deletion returned unexpected HTTP ${response.status}`)
+    }
+    return { success: true, output: { deleted: true } }
+  },
   outputs: { deleted: { type: 'boolean', description: 'Whether the branch was deleted' } },
   errorExtractor: BITBUCKET_ERROR_EXTRACTOR,
 }

apps/sim/tools/bitbucket/get_merge_task_status.ts

@@ -78,8 +78,6 @@ export const bitbucketGetMergeTaskStatusTool: ToolConfig<
       const result = record(data.merge_result)
       if (!result) throw new Error('Bitbucket successful merge task omitted merge_result')
       mergeResult = normalizeBitbucketPullRequest(result)
-    } else if (data.merge_result !== undefined && data.merge_result !== null) {
-      throw new Error('Bitbucket pending merge task returned an unexpected merge_result')
     }
 
     return {

apps/sim/tools/bitbucket/get_pull_request_diffstat.ts

@@ -60,7 +60,7 @@ export const bitbucketGetPullRequestDiffstatTool: ToolConfig<
     const initialUrl = pullRequestDiffstatUrl(params)
     const headers = bitbucketHeaders(params.accessToken)
     let response: Response
-    if (params.nextUrl) {
+    if (params.nextUrl !== undefined) {
       const continuation = validateBitbucketPullRequestRedirect(
         params.nextUrl,
         params.workspaceSlug,