fix(atlassian): sanitize malformed discovery responses

Author: Bill Leoutsakos

apps/sim/lib/atlassian/discovery.test.ts

@@ -136,6 +136,27 @@ describe('resolveAtlassianCloudId', () => {
     expect(error.message).not.toContain('provider-body-secret-marker')
   })
 
+  it('omits malformed successful response bodies from selector discovery errors', async () => {
+    fetchMock.mockResolvedValue({
+      ok: true,
+      status: 200,
+      headers: new Headers(),
+      json: vi
+        .fn()
+        .mockRejectedValue(new SyntaxError('invalid provider-body-secret-marker JSON payload')),
+    })
+
+    const error = await resolveAtlassianCloudId(
+      options({
+        retryOptions: { ...FAST, omitResponseBodyFromErrors: true },
+      })
+    ).catch((caught) => caught as Error)
+
+    expect(error.message).toBe('Failed to fetch Jira accessible resources: invalid JSON response')
+    expect(error.message).not.toContain('provider-body-secret-marker')
+    expect(fetchMock).toHaveBeenCalledTimes(1)
+  })
+
   it('does not pin a failure in the cache', async () => {
     fetchMock.mockResolvedValueOnce(failure(403, { message: 'nope' }))
     await expect(resolveAtlassianCloudId(options({ retryOptions: FAST }))).rejects.toThrow()

apps/sim/lib/atlassian/discovery.ts

@@ -172,7 +172,14 @@ export function fetchAtlassianDiscoveryJson<T>(
         throw error
       }
 
-      return (await response.json()) as T
+      try {
+        return (await response.json()) as T
+      } catch (error) {
+        if (omitResponseBodyFromErrors) {
+          throw new Error(`${failureLabel}: invalid JSON response`)
+        }
+        throw error
+      }
     },
     { ...ATLASSIAN_DISCOVERY_RETRY_OPTIONS, ...effectiveRetryOptions }
   )