fix(posthog): address PR review - fix pre-tx event, auth_method, paused executions, enterprise cancellation, settings double-fire

Author: waleedlatif1

apps/sim/app/api/workflows/route.ts

@@ -250,13 +250,6 @@ export async function POST(req: NextRequest) {
         // Silently fail
       })
 
-    captureServerEvent(
-      userId,
-      'workflow_created',
-      { workflow_id: workflowId, workspace_id: workspaceId ?? '', name },
-      { groups: { workspace: workspaceId ?? '' } }
-    )
-
     const { workflowState, subBlockValues, startBlockId } = buildDefaultWorkflowArtifacts()
 
     await db.transaction(async (tx) => {
@@ -282,6 +275,16 @@ export async function POST(req: NextRequest) {
 
     logger.info(`[${requestId}] Successfully created workflow ${workflowId} with default blocks`)
 
+    captureServerEvent(
+      userId,
+      'workflow_created',
+      { workflow_id: workflowId, workspace_id: workspaceId ?? '', name },
+      {
+        groups: { workspace: workspaceId ?? '' },
+        setOnce: { first_workflow_created_at: new Date().toISOString() },
+      }
+    )
+
     recordAudit({
       workspaceId,
       actorId: userId,

apps/sim/app/workspace/[workspaceId]/settings/[section]/settings.tsx

@@ -1,6 +1,6 @@
 'use client'
 
-import { useEffect } from 'react'
+import { useEffect, useRef } from 'react'
 import dynamic from 'next/dynamic'
 import { useSearchParams } from 'next/navigation'
 import { usePostHog } from 'posthog-js/react'
@@ -163,6 +163,10 @@ export function SettingsPage({ section }: SettingsPageProps) {
   const mcpServerId = searchParams.get('mcpServerId')
   const { data: session, isPending: sessionLoading } = useSession()
   const posthog = usePostHog()
+  const posthogRef = useRef(posthog)
+  useEffect(() => {
+    posthogRef.current = posthog
+  }, [posthog])
 
   const isAdminRole = session?.user?.role === 'admin'
   const effectiveSection =
@@ -179,8 +183,8 @@ export function SettingsPage({ section }: SettingsPageProps) {
 
   useEffect(() => {
     if (sessionLoading) return
-    posthog?.capture('settings_tab_viewed', { section: effectiveSection })
-  }, [effectiveSection, sessionLoading, posthog])
+    posthogRef.current?.capture('settings_tab_viewed', { section: effectiveSection })
+  }, [effectiveSection, sessionLoading])
 
   return (
     <div>

apps/sim/lib/auth/auth.ts

@@ -20,7 +20,7 @@ import {
   organization,
 } from 'better-auth/plugins'
 import { emailHarmony } from 'better-auth-harmony'
-import { and, eq, inArray, sql } from 'drizzle-orm'
+import { and, count, eq, inArray, sql } from 'drizzle-orm'
 import { headers } from 'next/headers'
 import Stripe from 'stripe'
 import {
@@ -191,13 +191,6 @@ export const auth = betterAuth({
             // Telemetry should not fail the operation
           }
 
-          captureServerEvent(
-            user.id,
-            'user_created',
-            { auth_method: 'email' },
-            { setOnce: { signup_at: new Date().toISOString() } }
-          )
-
           try {
             await handleNewUser(user.id)
           } catch (error) {
@@ -377,6 +370,34 @@ export const auth = betterAuth({
             })
           }
 
+          try {
+            const [{ value: accountCount }] = await db
+              .select({ value: count() })
+              .from(schema.account)
+              .where(eq(schema.account.userId, account.userId))
+
+            if (accountCount === 1) {
+              const isOAuth = account.providerId !== 'credential'
+              captureServerEvent(
+                account.userId,
+                'user_created',
+                {
+                  auth_method: isOAuth ? 'oauth' : 'email',
+                  ...(isOAuth ? { provider: account.providerId } : {}),
+                },
+                { setOnce: { signup_at: new Date().toISOString() } }
+              )
+            }
+          } catch (error) {
+            logger.error(
+              '[databaseHooks.account.create.after] Failed to capture user_created event',
+              {
+                userId: account.userId,
+                error,
+              }
+            )
+          }
+
           if (account.providerId === 'salesforce') {
             const updates: {
               accessTokenExpiresAt?: Date

apps/sim/lib/billing/webhooks/subscription.ts

@@ -219,6 +219,17 @@ export async function handleSubscriptionDeleted(subscription: {
         organizationDeleted,
         membersSynced,
       })
+
+      captureServerEvent(
+        subscription.referenceId,
+        'subscription_cancelled',
+        {
+          plan: subscription.plan ?? 'unknown',
+          reference_id: subscription.referenceId,
+        },
+        { set: { plan: 'free' } }
+      )
+
       return
     }
 

apps/sim/lib/workflows/executor/execute-workflow.ts

@@ -107,23 +107,25 @@ export async function executeWorkflow(
           .filter((t): t is string => typeof t === 'string')
       ),
     ]
-    captureServerEvent(
-      actorUserId,
-      'workflow_executed',
-      {
-        workflow_id: workflowId,
-        workspace_id: workspaceId,
-        trigger_type: triggerType,
-        success: result.success,
-        block_count: result.logs?.length ?? 0,
-        block_types: blockTypes.join(','),
-        duration_ms: Date.now() - executionStartMs,
-      },
-      {
-        groups: { workspace: workspaceId },
-        setOnce: { first_execution_at: new Date().toISOString() },
-      }
-    )
+    if (result.status !== 'paused') {
+      captureServerEvent(
+        actorUserId,
+        'workflow_executed',
+        {
+          workflow_id: workflowId,
+          workspace_id: workspaceId,
+          trigger_type: triggerType,
+          success: result.success,
+          block_count: result.logs?.length ?? 0,
+          block_types: blockTypes.join(','),
+          duration_ms: Date.now() - executionStartMs,
+        },
+        {
+          groups: { workspace: workspaceId },
+          setOnce: { first_execution_at: new Date().toISOString() },
+        }
+      )
+    }
 
     if (result.status === 'paused') {
       if (!result.snapshotSeed) {