fix(zoho-desk): review round - DC-base derivation, org-loader resilience, batched-event visibility

- deriveZohoDeskBaseFromApiDomain: preserve an already-regional desk.zoho.<tld>
  api_domain instead of falling back to the US (.com) data center, and map the
  DC TLD from any zoho(apis).<tld> host - keeps Desk calls in the right data
  center for residency.
- fetchZohoDeskOrganizationOptions: wrap the token/org fetch in try/catch and
  degrade to an empty list (the org field is a free-text combobox, so manual
  entry still works) instead of hard-failing the selector on token/DC/network
  errors.
- formatInput: warn (not silently drop) if Zoho ever delivers more than one
  event in a single payload.

Author: mzxchandra

apps/sim/blocks/blocks/zoho-desk-org-options.ts

@@ -1,9 +1,13 @@
+import { createLogger } from '@sim/logger'
+import { getErrorMessage } from '@sim/utils/errors'
 import { requestJson } from '@/lib/api/client/request'
 import { zohoDeskListOrganizationsContract } from '@/lib/api/contracts/tools/zoho-desk'
 import { fetchOAuthToken } from '@/hooks/selectors/helpers'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
 
+const logger = createLogger('ZohoDeskOrgOptions')
+
 /**
  * Populate a Zoho Desk organization selector from the connected credential.
  *
@@ -23,13 +27,21 @@ export async function fetchZohoDeskOrganizationOptions(
     (blockValues?.manualCredential as string) ||
     (blockValues?.triggerCredentials as string)
   if (!credentialId) return []
-  const bundle = await fetchOAuthToken(credentialId, activeWorkflowId)
-  if (!bundle) return []
-  const data = await requestJson(zohoDeskListOrganizationsContract, {
-    body: { accessToken: bundle.accessToken, apiDomain: bundle.apiDomain ?? null },
-  })
-  return data.organizations.map((org) => ({
-    label: org.companyName ? `${org.companyName} (${org.id})` : org.id,
-    id: org.id,
-  }))
+  // Degrade to an empty list on any failure (expired token, wrong data center,
+  // network error): the org field is a free-text combobox, so the user can still
+  // type an organization ID manually instead of the selector hard-failing.
+  try {
+    const bundle = await fetchOAuthToken(credentialId, activeWorkflowId)
+    if (!bundle) return []
+    const data = await requestJson(zohoDeskListOrganizationsContract, {
+      body: { accessToken: bundle.accessToken, apiDomain: bundle.apiDomain ?? null },
+    })
+    return data.organizations.map((org) => ({
+      label: org.companyName ? `${org.companyName} (${org.id})` : org.id,
+      id: org.id,
+    }))
+  } catch (error) {
+    logger.warn('Failed to load Zoho Desk organizations', { message: getErrorMessage(error) })
+    return []
+  }
 }

apps/sim/lib/auth/auth.ts

@@ -170,9 +170,14 @@ function deriveZohoDeskBaseFromApiDomain(apiDomain?: string): string {
   const fallback = 'https://desk.zoho.com'
   if (!apiDomain) return fallback
   try {
-    const host = new URL(apiDomain).host
-    const match = host.match(/zohoapis\.(.+)$/i)
-    if (match?.[1]) return `https://desk.zoho.${match[1].toLowerCase()}`
+    const host = new URL(apiDomain).host.toLowerCase()
+    // Already a data-center Desk host (e.g. desk.zoho.eu) - preserve it so we
+    // never misroute a valid regional domain back to the US (.com) data center.
+    if (/(^|\.)desk\.zoho\.[a-z.]+$/.test(host)) return `https://${host}`
+    // Otherwise map the data-center TLD from the API host (www.zohoapis.<tld> or
+    // any zoho.<tld>) onto the Desk REST host in the same data center.
+    const match = host.match(/zoho(?:apis)?\.([a-z.]+)$/)
+    if (match?.[1]) return `https://desk.zoho.${match[1]}`
     return fallback
   } catch {
     return fallback

apps/sim/lib/webhooks/providers/zoho-desk.ts

@@ -339,12 +339,19 @@ export const zohoDeskHandler: WebhookProviderHandler = {
     }
   },
 
-  async formatInput({ body }: FormatInputContext): Promise<FormatInputResult> {
+  async formatInput({ body, requestId }: FormatInputContext): Promise<FormatInputResult> {
     // Zoho Desk delivers an array of events: [{ payload, prevState, eventTime, eventType, orgId }].
     // Anything that is not the expected array shape is passed through unchanged.
     if (!Array.isArray(body)) {
       return { input: body }
     }
+    // Zoho fires one event per notification (single-element array). Log rather
+    // than silently drop if that ever changes, so batched deliveries are visible.
+    if (body.length > 1) {
+      logger.warn(
+        `[${requestId}] Zoho Desk delivered ${body.length} events in one payload; processing the first only`
+      )
+    }
     const event = body[0]
     if (!event || typeof event !== 'object') {
       return { input: body }