fix(credentials): stabilize oauth draft retries

Author: TheodoreSpeaks

apps/sim/lib/credentials/application/create-credential-connection.test.ts

@@ -97,6 +97,7 @@ describe('createCredentialConnection', () => {
       providerId: 'google-email',
       credentialId: undefined,
       displayName: 'Work Gmail',
+      displayNameDefinesIntent: true,
     })
     expect(result).toEqual({
       authorizationUrl: 'https://sim.ai/api/auth/oauth2/authorize?draftId=draft-1',
@@ -123,6 +124,7 @@ describe('createCredentialConnection', () => {
       providerId: 'google-email',
       credentialId: 'credential-1',
       displayName: 'Existing Gmail',
+      displayNameDefinesIntent: false,
     })
   })
 })

apps/sim/lib/credentials/application/create-credential-connection.ts

@@ -42,6 +42,7 @@ export const createCredentialConnection = defineAuthorizedWorkspaceUseCase({
       providerId: target.providerId,
       credentialId: target.credentialId,
       displayName,
+      displayNameDefinesIntent: input.providerId !== undefined,
     })
     const authorizationUrl = new URL('/api/auth/oauth2/authorize', getBaseUrl())
     authorizationUrl.searchParams.set('draftId', draft.id)

apps/sim/lib/credentials/connect-draft.test.ts

@@ -1,7 +1,7 @@
 /**
  * @vitest-environment node
  */
-import { dbChainMockFns, resetDbChainMock } from '@sim/testing'
+import { dbChainMockFns, drizzleOrmMock, resetDbChainMock, schemaMock } from '@sim/testing'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 const { mockGenerateId } = vi.hoisted(() => ({
@@ -28,6 +28,7 @@ describe('createConnectDraft', () => {
       workspaceId: 'workspace-1',
       providerId: 'google-email',
       displayName: 'Work Gmail',
+      displayNameDefinesIntent: true,
     })
 
     expect(dbChainMockFns.values).toHaveBeenCalledWith(
@@ -43,6 +44,26 @@ describe('createConnectDraft', () => {
     expect(result).toEqual({ id: 'active-draft-id', expiresAt })
   })
 
+  it('refreshes a reconnect target when its mutable display name changes', async () => {
+    const expiresAt = new Date('2026-08-13T20:15:00.000Z')
+    dbChainMockFns.returning.mockResolvedValueOnce([{ id: 'active-draft-id', expiresAt }])
+
+    await expect(
+      createConnectDraft({
+        userId: 'user-1',
+        workspaceId: 'workspace-1',
+        providerId: 'google-email',
+        credentialId: 'credential-1',
+        displayName: 'Renamed Gmail',
+      })
+    ).resolves.toEqual({ id: 'active-draft-id', expiresAt })
+
+    expect(drizzleOrmMock.eq).not.toHaveBeenCalledWith(
+      schemaMock.pendingCredentialDraft.displayName,
+      'Renamed Gmail'
+    )
+  })
+
   it('fails fast when an active draft has a different connection intent', async () => {
     dbChainMockFns.returning.mockResolvedValueOnce([])
 

apps/sim/lib/credentials/connect-draft.ts

@@ -29,6 +29,8 @@ export async function createConnectDraft(params: {
   credentialId?: string
   /** Reconnect only: the credential's actual name, so audit records stay accurate. */
   displayName?: string
+  /** Whether an explicitly requested name distinguishes this new-connection intent. */
+  displayNameDefinesIntent?: boolean
 }): Promise<CreatedConnectDraft> {
   const { userId, workspaceId, providerId, credentialId } = params
 
@@ -67,6 +69,12 @@ export async function createConnectDraft(params: {
       and(eq(pendingCredentialDraft.userId, userId), lt(pendingCredentialDraft.expiresAt, now))
     )
   const id = generateId()
+  const sameTarget = credentialId
+    ? eq(pendingCredentialDraft.credentialId, credentialId)
+    : isNull(pendingCredentialDraft.credentialId)
+  const sameIntent = params.displayNameDefinesIntent
+    ? and(sameTarget, eq(pendingCredentialDraft.displayName, displayName))
+    : sameTarget
   const [draft] = await db
     .insert(pendingCredentialDraft)
     .values({
@@ -86,12 +94,7 @@ export async function createConnectDraft(params: {
         pendingCredentialDraft.workspaceId,
       ],
       set: { expiresAt, createdAt: now },
-      setWhere: and(
-        eq(pendingCredentialDraft.displayName, displayName),
-        credentialId
-          ? eq(pendingCredentialDraft.credentialId, credentialId)
-          : isNull(pendingCredentialDraft.credentialId)
-      ),
+      setWhere: sameIntent,
     })
     .returning({ id: pendingCredentialDraft.id, expiresAt: pendingCredentialDraft.expiresAt })