refactor(tiktok): remove rollout compatibility

Author: Bill Leoutsakos

apps/sim/app/api/webhooks/tiktok/route.test.ts

@@ -7,27 +7,19 @@ import { requestUtilsMockFns, resetEnvMock, setEnv } from '@sim/testing'
 import { NextRequest } from 'next/server'
 import { afterAll, beforeEach, describe, expect, it, vi } from 'vitest'
 
-const {
-  mockDispatchResolvedWebhookTarget,
-  mockFindLegacyTikTokWebhooks,
-  mockFindWebhooksByRoutingKey,
-  mockRelease,
-} = vi.hoisted(() => ({
-  mockDispatchResolvedWebhookTarget: vi.fn(),
-  mockFindLegacyTikTokWebhooks: vi.fn(),
-  mockFindWebhooksByRoutingKey: vi.fn(),
-  mockRelease: vi.fn(),
-}))
+const { mockDispatchResolvedWebhookTarget, mockFindWebhooksByRoutingKey, mockRelease } = vi.hoisted(
+  () => ({
+    mockDispatchResolvedWebhookTarget: vi.fn(),
+    mockFindWebhooksByRoutingKey: vi.fn(),
+    mockRelease: vi.fn(),
+  })
+)
 
 vi.mock('@/lib/webhooks/processor', () => ({
   dispatchResolvedWebhookTarget: mockDispatchResolvedWebhookTarget,
   findWebhooksByRoutingKey: mockFindWebhooksByRoutingKey,
 }))
 
-vi.mock('@/lib/webhooks/tiktok-legacy-routing', () => ({
-  findLegacyTikTokWebhooks: mockFindLegacyTikTokWebhooks,
-}))
-
 vi.mock('@/lib/core/admission/gate', () => ({
   admissionRejectedResponse: vi.fn(() => new Response(null, { status: 503 })),
   tryAdmit: vi.fn(() => ({ release: mockRelease })),
@@ -76,7 +68,6 @@ describe('TikTok app webhook route', () => {
     setEnv({ TIKTOK_CLIENT_ID: 'client-key', TIKTOK_CLIENT_SECRET: 'client-secret' })
     requestUtilsMockFns.mockGenerateRequestId.mockReturnValue('request-1')
     mockFindWebhooksByRoutingKey.mockResolvedValue([])
-    mockFindLegacyTikTokWebhooks.mockResolvedValue([])
     mockDispatchResolvedWebhookTarget.mockResolvedValue({ outcome: 'queued', reason: 'queued' })
   })
 
@@ -113,22 +104,6 @@ describe('TikTok app webhook route', () => {
     expect(mockDispatchResolvedWebhookTarget).not.toHaveBeenCalled()
   })
 
-  it('also dispatches legacy null-routing-key registrations during rolling deployment', async () => {
-    mockFindLegacyTikTokWebhooks.mockResolvedValue([target('legacy-webhook')])
-
-    const response = await POST(signedRequest({ userOpenId: 'legacy-user' }))
-
-    expect(response.status).toBe(200)
-    expect(mockFindLegacyTikTokWebhooks).toHaveBeenCalledWith('legacy-user')
-    expect(mockDispatchResolvedWebhookTarget).toHaveBeenCalledWith(
-      expect.objectContaining({ id: 'legacy-webhook' }),
-      expect.objectContaining({ id: 'workflow-legacy-webhook' }),
-      expect.any(Object),
-      expect.any(NextRequest),
-      expect.any(Object)
-    )
-  })
-
   it('dispatches matching workflows sequentially', async () => {
     mockFindWebhooksByRoutingKey.mockResolvedValue([target('webhook-1'), target('webhook-2')])
     const order: string[] = []

apps/sim/app/api/webhooks/tiktok/route.ts

@@ -14,7 +14,6 @@ import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
 import { WEBHOOK_MAX_BODY_BYTES } from '@/lib/webhooks/constants'
 import { dispatchResolvedWebhookTarget, findWebhooksByRoutingKey } from '@/lib/webhooks/processor'
 import { verifyTikTokSignature } from '@/lib/webhooks/providers/tiktok'
-import { findLegacyTikTokWebhooks } from '@/lib/webhooks/tiktok-legacy-routing'
 
 const logger = createLogger('TikTokAppWebhookAPI')
 
@@ -94,9 +93,7 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
       return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
     }
 
-    const routedWebhooks = await findWebhooksByRoutingKey(envelope.user_openid, requestId, 'tiktok')
-    const legacyWebhooks = await findLegacyTikTokWebhooks(envelope.user_openid)
-    const webhooks = [...routedWebhooks, ...legacyWebhooks]
+    const webhooks = await findWebhooksByRoutingKey(envelope.user_openid, requestId, 'tiktok')
     let dispatched = 0
     let failed = 0
     for (const { webhook, workflow } of webhooks) {

apps/sim/lib/webhooks/tiktok-legacy-routing.test.ts

@@ -59,4 +59,11 @@ END $$;
 -- migration-safe: remove the session-local scratch table after the backfill completes.
 DROP TABLE IF EXISTS "_tiktok_webhook_routing_backfill";
 --> statement-breakpoint
+-- The routing-key index replaces the old TikTok credential-expression lookup.
 COMMIT;
+--> statement-breakpoint
+SET lock_timeout = 0;
+--> statement-breakpoint
+DROP INDEX CONCURRENTLY IF EXISTS "webhook_tiktok_credential_id_idx";
+--> statement-breakpoint
+SET lock_timeout = '5s';

apps/sim/lib/webhooks/tiktok-legacy-routing.ts

@@ -13618,22 +13618,6 @@
           "method": "btree",
           "with": {}
         },
-        "webhook_tiktok_credential_id_idx": {
-          "name": "webhook_tiktok_credential_id_idx",
-          "columns": [
-            {
-              "expression": "((\"provider_config\")::jsonb ->> 'credentialId')",
-              "asc": true,
-              "isExpression": true,
-              "nulls": "last"
-            }
-          ],
-          "isUnique": false,
-          "where": "\"webhook\".\"provider\" = 'tiktok' AND \"webhook\".\"is_active\" = true AND \"webhook\".\"archived_at\" IS NULL",
-          "concurrently": false,
-          "method": "btree",
-          "with": {}
-        },
         "idx_webhook_on_workflow_id_block_id_updated_at_desc": {
           "name": "idx_webhook_on_workflow_id_block_id_updated_at_desc",
           "columns": [

packages/db/migrations/0282_tiktok_routing_key.sql

@@ -833,11 +833,6 @@ export const jobExecutionLogs = pgTable(
   })
 )
 
-/** Extracts the canonical credential ID persisted in webhook provider configuration. */
-export function webhookCredentialIdExpression(column: AnyPgColumn): SQL<string> {
-  return sql<string>`((${column})::jsonb ->> 'credentialId')`
-}
-
 export const webhook = pgTable(
   'webhook',
   {
@@ -856,15 +851,15 @@ export const webhook = pgTable(
     blockId: text('block_id'),
     /**
      * URL-addressable webhook path. NULL for shared-app providers (e.g. the
-     * native Slack OAuth trigger) whose events arrive on a single shared
+     * native Slack and TikTok triggers) whose events arrive on a single shared
      * endpoint and route by `routingKey` instead of a per-workflow path.
      */
     path: text('path'),
     /**
-     * Tenant routing key for shared-app providers. For `provider='slack_app'`
-     * this is the Slack `team_id`, derived server-side from the connected
-     * credential at deploy time — never user input. Inbound events match on
-     * this after HMAC verification.
+     * Tenant routing key for shared-app providers, such as Slack `team_id` or
+     * TikTok `open_id`, derived server-side from the connected credential at
+     * deploy time — never user input. Inbound events match on this after HMAC
+     * verification.
      */
     routingKey: text('routing_key'),
     provider: text('provider'), // e.g., "whatsapp", "github", etc.
@@ -896,11 +891,6 @@ export const webhook = pgTable(
       providerActiveWorkflowDeploymentIdx: index(
         'idx_webhook_on_provider_is_active_workflow_id_deploym_bdeed5468'
       ).on(table.provider, table.isActive, table.workflowId, table.deploymentVersionId),
-      tiktokCredentialIdIdx: index('webhook_tiktok_credential_id_idx')
-        .on(webhookCredentialIdExpression(table.providerConfig))
-        .where(
-          sql`${table.provider} = 'tiktok' AND ${table.isActive} = true AND ${table.archivedAt} IS NULL`
-        ),
       workflowBlockUpdatedDescIdx: index('idx_webhook_on_workflow_id_block_id_updated_at_desc').on(
         table.workflowId,
         table.blockId,