fix(salesforce): match sandbox credentials in Chat and the connect draft

Two more surfaces resolved a credential to its service by exact provider id: - `credentialsForTarget` compared only `providerId`/`baseProviderId`, so a sandbox-only user's Salesforce chip in Chat read as disconnected and re-prompted them to connect. The alternate ids are passed in by the caller rather than resolved in the module, which is `'use client'` and would otherwise pull the OAuth provider registry into the chat bundle. - `createConnectDraft` resolved the service name by exact id, so a sandbox connect defaulted to the label "My salesforce-sandbox".
waleedlatif1 · Aug 11, 2026 · Aug 11, 2026 · Aug 11, 2026 · Aug 11, 2026 · Aug 11, 2026
commit 3b04abc88d13c9dddfa1720541f20d210bd4b034
diff --git a/apps/sim/app/api/auth/oauth2/authorize/route.test.ts b/apps/sim/app/api/auth/oauth2/authorize/route.test.ts
@@ -37,6 +37,19 @@ vi.mock('@/lib/credentials/access', () => ({
 
 vi.mock('@/lib/oauth/utils', () => ({
   getAllOAuthServices: vi.fn(() => [{ providerId: 'google-email', name: 'Gmail' }]),
+  // Real implementation: a credential id matches its service's OAuth id, an
+  // alternate authorization server, or the family's service-account id.
+  credentialProviderMatchesService: (
+    credentialProviderId: string,
+    service: {
+      providerId: string
+      serviceAccountProviderId?: string
+      additionalProviderIds?: readonly string[]
+    }
+  ) =>
+    service.providerId === credentialProviderId ||
+    service.serviceAccountProviderId === credentialProviderId ||
+    (service.additionalProviderIds?.includes(credentialProviderId) ?? false),
 }))
 
 import { GET } from '@/app/api/auth/oauth2/authorize/route'

diff --git a/...eId]/home/components/message-content/components/special-tags/use-oauth-chip-connection.ts b/...eId]/home/components/message-content/components/special-tags/use-oauth-chip-connection.ts
@@ -22,7 +22,7 @@ import {
 } from '@/lib/credentials/oauth-chat-attempt'
 import { getDesktopBridge } from '@/lib/desktop'
 import type { OAuthProvider } from '@/lib/oauth/types'
-import { parseProvider } from '@/lib/oauth/utils'
+import { parseProvider, providerIdsForService } from '@/lib/oauth/utils'
 import { useWorkspaceCredentials } from '@/hooks/queries/credentials'
 
 const OAUTH_POPUP_WINDOW_NAME = 'sim-oauth-connect'
@@ -188,7 +188,15 @@ export function useOAuthChipConnection({
   } | null>(null)
 
   const credentialTarget = useMemo(
-    () => ({ providerId, baseProviderId, credentialId: reconnectCredentialId }),
+    () => ({
+      providerId,
+      baseProviderId,
+      credentialId: reconnectCredentialId,
+      // A credential from an alternate authorization server (Salesforce
+      // sandbox) still connects this chip's service; without these the chip
+      // reads as disconnected and re-prompts a user who is already connected.
+      additionalProviderIds: providerIdsForService(providerId),
+    }),
     [baseProviderId, providerId, reconnectCredentialId]
   )
   const credentialScope = `${workspaceId}:${providerId}:${reconnectCredentialId ?? ''}`

diff --git a/apps/sim/lib/credentials/connect-draft.ts b/apps/sim/lib/credentials/connect-draft.ts
@@ -4,7 +4,7 @@ import { createLogger } from '@sim/logger'
 import { generateId } from '@sim/utils/id'
 import { and, eq, lt } from 'drizzle-orm'
 import { defaultCredentialDisplayName } from '@/lib/credentials/display-name'
-import { getAllOAuthServices } from '@/lib/oauth/utils'
+import { credentialProviderMatchesService, getAllOAuthServices } from '@/lib/oauth/utils'
 
 const logger = createLogger('OAuthConnectDraft')
 const DRAFT_TTL_MS = 15 * 60 * 1000
@@ -26,7 +26,12 @@ export async function createConnectDraft(params: {
 
   let displayName = params.displayName
   if (!displayName) {
-    const service = getAllOAuthServices().find((s) => s.providerId === providerId)
+    // Matches through the canonical predicate so an alternate authorization
+    // server's id resolves the service's real name — otherwise the default
+    // label reads "My salesforce-sandbox".
+    const service = getAllOAuthServices().find((s) =>
+      credentialProviderMatchesService(providerId, s)
+    )
     const serviceName = service?.name ?? providerId
 
     let userName: string | null = null

diff --git a/apps/sim/lib/credentials/oauth-chat-attempt.test.ts b/apps/sim/lib/credentials/oauth-chat-attempt.test.ts
@@ -10,6 +10,7 @@ import {
   createOAuthChatAttempt,
   getOAuthCredentialBaseline,
   hasOAuthCredentialChanged,
+  hasOAuthCredentialForTarget,
   OAUTH_CHAT_ATTEMPT_EVENT,
   OAUTH_CHAT_ATTEMPT_PARAM,
   OAUTH_CHAT_COMPLETE_PATH,
@@ -254,3 +255,59 @@ describe('OAuth chat attempts', () => {
     ).toBe(true)
   })
 })
+
+describe('credential matching for a chat chip', () => {
+  const credential = (providerId: string) => ({
+    id: `cred-${providerId}`,
+    providerId,
+    updatedAt: '2026-08-11T00:00:00.000Z',
+  })
+
+  it('matches a credential from an alternate authorization server', () => {
+    // A sandbox-only user is connected; without this the chip reads as
+    // disconnected and re-prompts them to connect Salesforce again.
+    expect(
+      hasOAuthCredentialForTarget(
+        {
+          providerId: 'salesforce',
+          baseProviderId: 'salesforce',
+          additionalProviderIds: ['salesforce-sandbox'],
+        },
+        [credential('salesforce-sandbox')]
+      )
+    ).toBe(true)
+  })
+
+  it('still matches the primary id and the base provider', () => {
+    const target = { providerId: 'google-email', baseProviderId: 'google' }
+    expect(hasOAuthCredentialForTarget(target, [credential('google-email')])).toBe(true)
+    expect(hasOAuthCredentialForTarget(target, [credential('google')])).toBe(true)
+  })
+
+  it('does not match an unrelated provider', () => {
+    expect(
+      hasOAuthCredentialForTarget(
+        {
+          providerId: 'salesforce',
+          baseProviderId: 'salesforce',
+          additionalProviderIds: ['salesforce-sandbox'],
+        },
+        [credential('hubspot')]
+      )
+    ).toBe(false)
+  })
+
+  it('honours an explicit credentialId over any provider match', () => {
+    expect(
+      hasOAuthCredentialForTarget(
+        {
+          providerId: 'salesforce',
+          baseProviderId: 'salesforce',
+          credentialId: 'cred-other',
+          additionalProviderIds: ['salesforce-sandbox'],
+        },
+        [credential('salesforce-sandbox')]
+      )
+    ).toBe(false)
+  })
+})
diff --git a/apps/sim/lib/credentials/oauth-chat-attempt.ts b/apps/sim/lib/credentials/oauth-chat-attempt.ts
@@ -24,6 +24,13 @@ export interface OAuthCredentialTarget {
   providerId: string
   baseProviderId: string
   credentialId?: string
+  /**
+   * Alternate authorization servers whose credentials authenticate this same
+   * service (`salesforce-sandbox`). Supplied by the caller rather than resolved
+   * here so this module stays free of the OAuth provider registry, which would
+   * otherwise pull icon components into the chat bundle.
+   */
+  additionalProviderIds?: readonly string[]
 }
 
 export interface OAuthCredentialBaseline {
@@ -65,7 +72,10 @@ function credentialsForTarget(
   }
   return credentials.filter(
     (credential) =>
-      credential.providerId === target.providerId || credential.providerId === target.baseProviderId
+      credential.providerId === target.providerId ||
+      credential.providerId === target.baseProviderId ||
+      (credential.providerId !== null &&
+        (target.additionalProviderIds?.includes(credential.providerId) ?? false))
   )
 }