fix(sim-links): repair leftover links on account deletion

Author: waleedlatif1

apps/sim/lib/billing/organizations/resource-handoff.ts

@@ -7,7 +7,7 @@ import {
   user,
   workspaceFiles,
 } from '@sim/db/schema'
-import { and, asc, eq, isNull, ne, sql } from 'drizzle-orm'
+import { and, asc, eq, isNull, ne, notInArray, sql } from 'drizzle-orm'
 import { OrchestrationError } from '@/lib/core/orchestration/types'
 import type { DbOrTx, DbTransaction } from '@/lib/db/types'
 import { handoffFileCreatorsInTx } from '@/lib/uploads/contexts/workspace/creator-handoff'
@@ -104,10 +104,7 @@ export async function reassignOrganizationSharedResourcesTx(
         eq(permissionGroup.createdBy, departingUserId)
       )
     )
-  await tx
-    .update(simLink)
-    .set({ createdBy: userId, updatedAt })
-    .where(and(eq(simLink.organizationId, organizationId), eq(simLink.createdBy, departingUserId)))
+  await reassignSimLinksTx(tx, organizationId, departingUserId, userId)
   await tx
     .update(ssoProvider)
     .set({ userId })
@@ -116,3 +113,48 @@ export async function reassignOrganizationSharedResourcesTx(
     )
   return userId
 }
+
+async function reassignSimLinksTx(
+  tx: DbTransaction,
+  organizationId: string,
+  fromUserId: string,
+  toUserId: string
+) {
+  await tx
+    .update(simLink)
+    .set({ createdBy: toUserId, updatedAt: new Date() })
+    .where(and(eq(simLink.organizationId, organizationId), eq(simLink.createdBy, fromUserId)))
+}
+
+/**
+ * Repairs Sim links a former member kept after leaving before departures handed them off. Never
+ * blocks erasure: an organization without an owner successor keeps the FK's `SET NULL`. Takes
+ * only the successor's row locks, so it is safe after the deleting account's user barrier.
+ */
+export async function handoffLeftoverSimLinksTx(
+  tx: DbTransaction,
+  departingUserId: string,
+  handledOrganizationIds: string[]
+) {
+  const rows = await tx
+    .selectDistinct({ organizationId: simLink.organizationId })
+    .from(simLink)
+    .where(
+      and(
+        eq(simLink.createdBy, departingUserId),
+        handledOrganizationIds.length > 0
+          ? notInArray(simLink.organizationId, handledOrganizationIds)
+          : undefined
+      )
+    )
+    .orderBy(asc(simLink.organizationId))
+  for (const { organizationId } of rows) {
+    const successorId = await findOrganizationSharedResourceSuccessor(
+      tx,
+      organizationId,
+      departingUserId,
+      true
+    )
+    if (successorId) await reassignSimLinksTx(tx, organizationId, departingUserId, successorId)
+  }
+}

apps/sim/lib/users/account-deletion.ts

@@ -34,6 +34,7 @@ import {
 } from '@/lib/billing/organizations/membership'
 import {
   findOrganizationSharedResourceSuccessor,
+  handoffLeftoverSimLinksTx,
   listSharedResourceOrganizationIdsForUser,
   reassignOrganizationSharedResourcesTx,
 } from '@/lib/billing/organizations/resource-handoff'
@@ -965,6 +966,7 @@ export async function deleteUserAccount(
     for (const organizationId of sharedOrganizationIds) {
       await reassignOrganizationSharedResourcesTx(tx, organizationId, userId)
     }
+    await handoffLeftoverSimLinksTx(tx, userId, sharedOrganizationIds)
 
     const sharedWorkspaceIds = await listSharedResourceWorkspaceIdsForUser(tx, userId)
     const { unresolved: resourceUnresolved } =

apps/sim/lib/workspaces/access/shared-resource-handoff.integration.ts

@@ -1334,6 +1334,40 @@ describe('shared resource retention across workspace departure and account erasu
     )
   })
 
+  it("repairs a former member's leftover Sim link to the owner on account deletion", async () => {
+    const fixture = await seedResources(false, false)
+    const organizationId = generateId()
+    const linkId = generateId()
+    organizationIds.push(organizationId)
+    await db.insert(organization).values({
+      id: organizationId,
+      name: 'Former organization',
+      slug: organizationId,
+      createdAt: new Date(),
+    })
+    await db.insert(member).values({
+      id: generateId(),
+      organizationId,
+      userId: fixture.ownerId,
+      role: 'owner',
+      createdAt: new Date(),
+    })
+    await db.insert(simLink).values({
+      id: linkId,
+      organizationId,
+      name: 'handbook',
+      normalizedName: 'handbook',
+      url: 'https://example.test/handbook',
+      restrictEdit: true,
+      createdBy: fixture.departingId,
+    })
+    await deleteUserAccount(fixture.departingId, { recordIdentity: false })
+    expect(
+      await db.select({ createdBy: simLink.createdBy }).from(simLink).where(eq(simLink.id, linkId))
+    ).toEqual([{ createdBy: fixture.ownerId }])
+    await assertRetained(fixture)
+  })
+
   it('refuses organization-only retention without an owner successor', async () => {
     const fixture = await seedResources(false, false)
     const organizationId = generateId()