fix(search): include Gmail in live connection inventory

Author: icecrasher321

apps/sim/lib/knowledge/application/personal-search-integrations.test.ts

@@ -24,8 +24,6 @@ vi.mock('@/lib/credential-groups/scoped-availability', () => ({
 vi.mock('@/lib/credential-groups/search-connection-completion', () => ({
   readSearchConnectionCompletion: m.completion,
 }))
-vi.mock('@/lib/oauth/utils', () => ({ providerIdsForService: (id: string) => [id] }))
-
 vi.mock('@/lib/core/application/organization-authorization', () => ({
   authorizeOrganizationOperation: m.authorize,
 }))
@@ -54,7 +52,7 @@ vi.mock('@/lib/integrations/availability.server', () => ({
 vi.mock('@/lib/sim-search/connectors', () => ({
   SEARCH_CONNECTORS: ['gmail', 'slack', 'notion'].map((type) => ({
     type,
-    providerId: type,
+    providerId: type === 'gmail' ? 'google-email' : type,
     meta: { name: type },
     setupFields: [],
   })),
@@ -71,7 +69,7 @@ const principal = { kind: 'session', userId: 'person', sessionId: 'session' } as
 const input = { organizationId: 'org' }
 const target = {
   type: 'link',
-  provider: 'gmail',
+  provider: 'google-email',
   connectorType: 'gmail',
   connectorId: 'source',
 } as const
@@ -238,6 +236,42 @@ describe('live Search connection controls', () => {
     )
   })
 
+  it('offers Gmail when its Credential Group provider differs from its OAuth provider ID', async () => {
+    m.group.mockResolvedValue({
+      id: 'group',
+      status: 'active',
+      options: [
+        { id: 'gmail-option', provider: 'gmail', status: 'active', configurationStatus: 'ready' },
+      ],
+    })
+    m.accounts.mockResolvedValue([
+      {
+        optionId: 'gmail-option',
+        credentialId: 'my-gmail',
+        displayName: 'me@example.com',
+        status: 'active',
+      },
+    ])
+
+    const result = await listPersonalSearchIntegrations.execute({ principal, input })
+    const addTarget = {
+      type: 'link',
+      provider: 'gmail',
+      connectorType: 'gmail',
+      connectionMode: 'live',
+      optionId: 'gmail-option',
+    }
+    expect(result.available).toEqual([{ name: 'gmail', description: '', target: addTarget }])
+    expect(result.connections[0].accounts).toEqual([
+      {
+        credentialId: 'my-gmail',
+        displayName: 'me@example.com',
+        status: 'connected',
+        action: { ...addTarget, credentialId: 'my-gmail' },
+      },
+    ])
+  })
+
   it('keeps adding an account distinct from reconnecting an owned account', async () => {
     m.accounts.mockResolvedValue([
       { optionId: 'slack-option', credentialId: 'mine', displayName: 'My Slack', status: 'active' },

apps/sim/lib/knowledge/application/personal-search-integrations.ts

@@ -4,6 +4,7 @@ import { credentialGroup, user } from '@sim/db/schema'
 import { eq } from 'drizzle-orm'
 import { isLiveEnterpriseSearchEnabled } from '@/lib/core/config/env-flags'
 import { OrchestrationError } from '@/lib/core/orchestration/types'
+import { findCredentialGroupProviderFromProviderId } from '@/lib/credential-groups/providers'
 import { isScopedCredentialGroupsAvailable } from '@/lib/credential-groups/scoped-availability'
 import { readSearchConnectionCompletion } from '@/lib/credential-groups/search-connection-completion'
 import { getOrganizationAccountsGroup } from '@/lib/credential-groups/service'
@@ -20,7 +21,6 @@ import { listConfiguredSearchProviderTypes } from '@/lib/knowledge/application/s
 import { listSearchSources } from '@/lib/knowledge/application/search-sources'
 import type { SearchConnectionTarget } from '@/lib/knowledge/search/connection-target'
 import { listOrganizationSearchApprovals } from '@/lib/knowledge/search/integration-policy'
-import { providerIdsForService } from '@/lib/oauth/utils'
 import { getConnectorAccessAvailability, SEARCH_CONNECTORS } from '@/lib/sim-search/connectors'
 import { LIVE_SEARCH_SCOPE_FIELDS } from '@/lib/sim-search/live/policy-schema'
 import { findSharedSlackSearchInstallation } from '@/lib/slack-search/shared-app'
@@ -64,8 +64,8 @@ export const listPersonalSearchIntegrations = defineAuthorizedKnowledgeUseCase({
           })
         : []
       const connections = (group?.options ?? []).flatMap((option) => {
-        const connector = SEARCH_CONNECTORS.find((entry) =>
-          providerIdsForService(entry.providerId).includes(option.provider)
+        const connector = SEARCH_CONNECTORS.find(
+          (entry) => findCredentialGroupProviderFromProviderId(entry.providerId) === option.provider
         )
         if (
           !connector ||

apps/sim/lib/mothership/tools/handlers/oauth.test.ts

@@ -59,7 +59,7 @@ describe('executeOAuthGetAuthLink', () => {
     async (mode) => {
       const target = {
         type: 'link',
-        provider: 'google-email',
+        provider: mode === 'live' ? 'gmail' : 'google-email',
         connectorType: 'gmail',
         ...(mode === 'live'
           ? { connectionMode: 'live', optionId: 'option' }