test(integrations): pin OAuth service resolution for all catalog integrations; fix credential branding reverse lookup

Author: waleedlatif1

apps/sim/app/workspace/[workspaceId]/integrations/[block]/integration-block-detail.tsx

@@ -66,8 +66,7 @@ export function IntegrationBlockDetail({ integration, workspaceId }: Integration
       (c) =>
         (c.type === 'oauth' || c.type === 'service_account') &&
         c.providerId &&
-        getServiceConfigByProviderId(c.providerId)?.name.toLowerCase() ===
-          oauthService.serviceName.toLowerCase()
+        getServiceConfigByProviderId(c.providerId)?.providerId === oauthService.providerId
     )
   }, [credentials, oauthService])
   const [serviceAccountOpen, setServiceAccountOpen] = useState(false)

apps/sim/app/workspace/[workspaceId]/integrations/connected/[credentialId]/connected-credential-detail.tsx

@@ -15,7 +15,7 @@ import {
 } from '@/components/emcn'
 import { ArrowLeft } from '@/components/emcn/icons'
 import { writeOAuthReturnContext } from '@/lib/credentials/client-state'
-import { INTEGRATIONS } from '@/lib/integrations'
+import { INTEGRATIONS, resolveOAuthServiceForIntegration } from '@/lib/integrations'
 import { getServiceConfigByProviderId } from '@/lib/oauth'
 import {
   AddPeopleModal,
@@ -98,15 +98,20 @@ export function ConnectedCredentialDetail({
   }, [credential])
 
   /**
-   * Resolve the integration block type from the OAuth service name so the
-   * header tile can render with the same brand background used by the rows on
-   * the integrations list page.
+   * Resolve the integration block type from the credential's OAuth service so
+   * the header tile can render with the same brand background used by the rows
+   * on the integrations list page. Several integrations can share one service
+   * (e.g. Jira and Jira Service Management); the one named after the service
+   * is preferred since it is the service's canonical integration.
    */
   const integrationBlockType = useMemo(() => {
-    const name = serviceConfig?.name.toLowerCase()
-    if (!name) return ''
-    const match = INTEGRATIONS.find((i) => i.name.toLowerCase() === name)
-    return match?.type ?? ''
+    if (!serviceConfig) return ''
+    const candidates = INTEGRATIONS.filter(
+      (i) => resolveOAuthServiceForIntegration(i)?.providerId === serviceConfig.providerId
+    )
+    const serviceName = serviceConfig.name.toLowerCase()
+    const canonical = candidates.find((i) => i.name.toLowerCase() === serviceName)
+    return (canonical ?? candidates[0])?.type ?? ''
   }, [serviceConfig])
 
   const handleReconnectOAuth = async () => {

apps/sim/lib/integrations/oauth-service.test.ts

@@ -8,6 +8,64 @@ import type { Integration } from '@/lib/integrations/types'
 
 const INTEGRATIONS = integrationsJson.integrations as readonly Integration[]
 
+/**
+ * Pinned slug → OAuth providerId mapping for every OAuth integration in the
+ * catalog. Guards against silent drift between block `serviceId`s, the
+ * generated catalog, and `OAUTH_PROVIDERS` — the failure mode that made
+ * Jira Service Management, Google Slides, and Monday fall back to the
+ * API-key connect path.
+ */
+const EXPECTED_PROVIDER_BY_SLUG: Record<string, string> = {
+  airtable: 'airtable',
+  asana: 'asana',
+  attio: 'attio',
+  'azure-ad': 'microsoft-ad',
+  box: 'box',
+  'cal-com': 'calcom',
+  confluence: 'confluence',
+  docusign: 'docusign',
+  dropbox: 'dropbox',
+  gmail: 'google-email',
+  'google-ads': 'google-ads',
+  'google-bigquery': 'google-bigquery',
+  'google-calendar': 'google-calendar',
+  'google-contacts': 'google-contacts',
+  'google-docs': 'google-docs',
+  'google-drive': 'google-drive',
+  'google-forms': 'google-forms',
+  'google-groups': 'google-groups',
+  'google-meet': 'google-meet',
+  'google-sheets': 'google-sheets',
+  'google-slides': 'google-drive',
+  'google-tasks': 'google-tasks',
+  'google-vault': 'google-vault',
+  hubspot: 'hubspot',
+  jira: 'jira',
+  'jira-service-management': 'jira',
+  linear: 'linear',
+  linkedin: 'linkedin',
+  'microsoft-dataverse': 'microsoft-dataverse',
+  'microsoft-excel': 'microsoft-excel',
+  'microsoft-planner': 'microsoft-planner',
+  'microsoft-teams': 'microsoft-teams',
+  monday: 'monday',
+  notion: 'notion',
+  onedrive: 'onedrive',
+  outlook: 'outlook',
+  pipedrive: 'pipedrive',
+  reddit: 'reddit',
+  salesforce: 'salesforce',
+  sharepoint: 'sharepoint',
+  shopify: 'shopify',
+  slack: 'slack',
+  trello: 'trello',
+  wealthbox: 'wealthbox',
+  webflow: 'webflow',
+  wordpress: 'wordpress',
+  x: 'x',
+  zoom: 'zoom',
+}
+
 describe('resolveOAuthServiceForSlug', () => {
   it.concurrent('resolves integrations whose name differs from the OAuth service name', () => {
     const jsm = resolveOAuthServiceForSlug('jira-service-management')
@@ -49,4 +107,25 @@ describe('resolveOAuthServiceForSlug', () => {
       .map((entry) => entry.slug)
     expect(unresolved).toEqual([])
   })
+
+  it.concurrent('resolves the pinned provider for every enumerated OAuth integration', () => {
+    const resolved = Object.fromEntries(
+      Object.keys(EXPECTED_PROVIDER_BY_SLUG).map((slug) => [
+        slug,
+        resolveOAuthServiceForSlug(slug)?.providerId ?? null,
+      ])
+    )
+    expect(resolved).toEqual(EXPECTED_PROVIDER_BY_SLUG)
+  })
+
+  it.concurrent('carries oauthServiceId for exactly the OAuth catalog entries', () => {
+    const missing = INTEGRATIONS.filter(
+      (entry) => entry.authType === 'oauth' && !entry.oauthServiceId
+    ).map((entry) => entry.slug)
+    const unexpected = INTEGRATIONS.filter(
+      (entry) => entry.authType !== 'oauth' && entry.oauthServiceId
+    ).map((entry) => entry.slug)
+    expect(missing).toEqual([])
+    expect(unexpected).toEqual([])
+  })
 })