Skip to content

Commit 244cf4f

Browse files
waleedlatif1claude
waleedlatif1
and
claude
authored
feat(selectors): add dropdown selectors for 14 integrations (#3433)
* feat(selectors): add dropdown selectors for 14 integrations * fix(selectors): secure OAuth tokens in JSM and Confluence selector routes Convert JSM selector-servicedesks, selector-requesttypes, and Confluence selector-spaces routes from GET (with access token in URL query params) to POST with authorizeCredentialUse + refreshAccessTokenIfNeeded pattern. Also adds missing ensureCredential guard to microsoft.planner.plans registry entry. * fix(selectors): use sanitized serviceDeskId and encode SharePoint siteId Use serviceDeskIdValidation.sanitized instead of raw serviceDeskId in JSM request types URL. Add encodeURIComponent to SharePoint siteId to prevent URL path injection. * lint * fix(selectors): revert encodeURIComponent on SharePoint siteId SharePoint site IDs use the format "hostname,guid,guid" with commas that must remain unencoded for the Microsoft Graph API. The encodeURIComponent call would convert commas to %2C and break the API call. * fix(selectors): use sanitized cloudId in Confluence and JSM route URLs Use cloudIdValidation.sanitized instead of raw cloudId in URL construction for consistency with the validation pattern, even though the current validator returns the input unchanged. * fix(selectors): add missing context fields to resolution, ensureCredential to sharepoint.lists, and siteId validation - Add baseId, datasetId, serviceDeskId to SelectorResolutionArgs, ExtendedSelectorContext, extractExtendedContext, useSelectorDisplayName, and resolveSelectorForSubBlock so cascading selectors resolve correctly through the resolution path. - Add ensureCredential guard to sharepoint.lists registry entry. - Add regex validation for SharePoint siteId format (hostname,GUID,GUID). * fix(selectors): rename advanced subBlock IDs to avoid canonicalParamId clashes Rename all advanced-mode subBlock IDs that matched their canonicalParamId to use a `manual*` prefix, following the established convention (e.g., manualSiteId, manualCredential). This prevents ambiguity between subBlock IDs and canonical parameter names in the serialization layer. 25 renames across 14 blocks: baseId→manualBaseId, tableId→manualTableId, workspace→manualWorkspace, objectType→manualObjectType, etc. * Revert "fix(selectors): rename advanced subBlock IDs to avoid canonicalParamId clashes" This reverts commit 4e30161. * fix(selectors): rename canonicalParamIds to avoid subBlock ID clashes Prefix all clashing canonicalParamId values with `selected_` so they don't match any subBlock ID. Update each block's `inputs` section and `tools.config.params` function to destructure the new canonical names and remap them to the original tool param names. SubBlock IDs and tool definitions remain unchanged for backwards compatibility. Affected: 25 canonical params across 14 blocks (airtable, asana, attio, calcom, confluence, google_bigquery, google_tasks, jsm, microsoft_planner, notion, pipedrive, sharepoint, trello, zoom). * fix(selectors): rename pre-existing driveId and files canonicalParamIds in SharePoint Apply the same selected_ prefix convention to the pre-existing SharePoint driveId and files canonical params that clashed with their subBlock IDs. * style: format long lines in calcom, pipedrive, and sharepoint blocks Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix(selectors): resolve cascading context for selected_ canonical params and normalize Asana response Strip `selected_` prefix from canonical param IDs when mapping to SelectorContext fields so cascading selectors (Airtable base→table, BigQuery dataset→table, JSM serviceDesk→requestType) correctly propagate parent values. Normalize Asana workspaces route to return `{ id, name }` instead of `{ gid, name }` for consistency with all other selector routes. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix(selectors): replace hacky prefix stripping with explicit CANONICAL_TO_CONTEXT mapping Replace CONTEXT_FIELD_SET (Record<string, true>) with CANONICAL_TO_CONTEXT (Record<string, keyof SelectorContext>) that explicitly maps canonical param IDs to their SelectorContext field names. This properly handles the selected_ prefix aliases (e.g. selected_baseId → baseId) without string manipulation, and removes the unsafe Record<string, unknown> cast. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * refactor(selectors): remove unnecessary selected_ prefix from canonicalParamIds The selected_ prefix was added to avoid a perceived clash between canonicalParamId and subBlock id values, but this clash does not actually cause any issues — pre-existing blocks on main (Google Sheets, Webflow, SharePoint) already use matching values successfully. Remove the prefix from all 14 blocks, revert use-selector-setup.ts to the simple CONTEXT_FIELD_SET pattern, and simplify tools.config.params functions that were only remapping the prefix back. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix(selectors): add spaceId selector pair to Confluence V2 block The V2 block was missing the spaceSelector basic-mode selector that the V1 (Legacy) block already had. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * refactor(selectors): revert V1 block changes, add selectors to Notion V1 for V2 inheritance Confluence V1: reverted to main state (V2 has its own subBlocks). Notion V1: added selector pairs per-operation since V2 inherits subBlocks, inputs, and params from V1. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix(selectors): audit fixes for auth patterns, registry gaps, and display name resolution - Convert Microsoft Planner plans/tasks routes from GET+getSession to POST+authorizeCredentialUse - Add fetchById to microsoft.planner (tasks) and sharepoint.sites registry entries - Add ensureCredential to sharepoint.sites and microsoft.planner registry fetchList - Update microsoft.planner.plans registry to use POST method - Add siteId, collectionId, spreadsheetId, fileId to SelectorDisplayNameArgs and caller - Add fileId to SelectorResolutionArgs and resolution context - Fix Zoom topicUpdate visibility in basic mode (remove mode:'advanced') - Change Zoom meetings selector to fetch upcoming_meetings instead of only scheduled Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * style: lint formatting fixes Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix(selectors): consolidate Notion canonical param pairs into array conditions Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix(selectors): add missing selectorKey to Confluence V1 page selector Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix(selectors): use sanitized IDs in URLs, convert SharePoint routes to POST+authorizeCredentialUse - Use planIdValidation.sanitized in MS Planner tasks fetch URL - Convert sharepoint/lists and sharepoint/sites from GET+getSession to POST+authorizeCredentialUse - Update registry entries to match POST pattern Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix(selectors): revert Zoom meetings type to scheduled for broader compatibility Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix(selectors): add SharePoint site ID validator, fix cascading selector display name fallbacks - Add validateSharePointSiteId to input-validation.ts - Use validation util in SharePoint lists route instead of inline regex - Add || fallback to selector IDs in workflow-block.tsx so cascading display names resolve in basic mode (baseSelector, planSelector, etc.) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix(selectors): hoist requestId before try block in all selector routes Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix(selectors): hoist requestId before try block in Trello boards route Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix(selectors): guard selector queries against unresolved variable references Skip fetchById and context population when values are design-time placeholders (<Block.output> or {{ENV_VAR}}) rather than real IDs. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * refactor(selectors): replace hardcoded display name fallbacks with canonical-aware resolution Use resolveDependencyValue to resolve context values for useSelectorDisplayName, eliminating manual || getStringValue('*Selector') fallbacks that required updating for each new selector pair. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix(selectors): tighten SharePoint site ID validation to exclude underscores SharePoint composite site IDs use hostname,guid,guid format where only alphanumerics, periods, hyphens, and commas are valid characters. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix(selectors): ensure string IDs in Pipedrive/Cal.com routes, fix Trello closed board filter Pipedrive pipelines and Cal.com event-types/schedules routes now consistently return string IDs via String() conversion. Trello boards route no longer filters out closed boards, preserving them for fetchById lookups. The closed filter is applied only in the registry's fetchList so archived boards don't appear in dropdowns but can still be resolved by ID for display names. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix(selectors): convert Zoom meeting IDs to strings for consistency Zoom API returns numeric meeting IDs. Convert with String() to match the string ID convention used by all other selector routes. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix(selectors): align registry types with route string ID returns Routes already convert numeric IDs to strings via String(), so update the registry types (CalcomEventType, CalcomSchedule, PipedrivePipeline, ZoomMeeting) from id: number to id: string and remove the now-redundant String() coercions in fetchList/fetchById. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
1 parent ae88718 commit 244cf4f

File tree

46 files changed

+3340
-231
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+3340
-231
lines changed

‎apps/sim/app/api/tools/airtable/bases/route.ts‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
import { createLogger } from '@sim/logger'
2+
import { NextResponse } from 'next/server'
3+
import { authorizeCredentialUse } from '@/lib/auth/credential-access'
4+
import { generateRequestId } from '@/lib/core/utils/request'
5+
import { refreshAccessTokenIfNeeded } from '@/app/api/auth/oauth/utils'
6+
7+
const logger = createLogger('AirtableBasesAPI')
8+
9+
export const dynamic = 'force-dynamic'
10+
11+
export async function POST(request: Request) {
12+
const requestId = generateRequestId()
13+
try {
14+
const body = await request.json()
15+
const { credential, workflowId } = body
16+
17+
if (!credential) {
18+
logger.error('Missing credential in request')
19+
return NextResponse.json({ error: 'Credential is required' }, { status: 400 })
20+
}
21+
22+
const authz = await authorizeCredentialUse(request as any, {
23+
credentialId: credential,
24+
workflowId,
25+
})
26+
if (!authz.ok || !authz.credentialOwnerUserId) {
27+
return NextResponse.json({ error: authz.error || 'Unauthorized' }, { status: 403 })
28+
}
29+
30+
const accessToken = await refreshAccessTokenIfNeeded(
31+
credential,
32+
authz.credentialOwnerUserId,
33+
requestId
34+
)
35+
if (!accessToken) {
36+
logger.error('Failed to get access token', {
37+
credentialId: credential,
38+
userId: authz.credentialOwnerUserId,
39+
})
40+
return NextResponse.json(
41+
{ error: 'Could not retrieve access token', authRequired: true },
42+
{ status: 401 }
43+
)
44+
}
45+
46+
const response = await fetch('https://api.airtable.com/v0/meta/bases', {
47+
headers: {
48+
Authorization: `Bearer ${accessToken}`,
49+
'Content-Type': 'application/json',
50+
},
51+
})
52+
53+
if (!response.ok) {
54+
const errorData = await response.json().catch(() => ({}))
55+
logger.error('Failed to fetch Airtable bases', {
56+
status: response.status,
57+
error: errorData,
58+
})
59+
return NextResponse.json(
60+
{ error: 'Failed to fetch Airtable bases', details: errorData },
61+
{ status: response.status }
62+
)
63+
}
64+
65+
const data = await response.json()
66+
const bases = (data.bases || []).map((base: { id: string; name: string }) => ({
67+
id: base.id,
68+
name: base.name,
69+
}))
70+
71+
return NextResponse.json({ bases })
72+
} catch (error) {
73+
logger.error('Error processing Airtable bases request:', error)
74+
return NextResponse.json(
75+
{ error: 'Failed to retrieve Airtable bases', details: (error as Error).message },
76+
{ status: 500 }
77+
)
78+
}
79+
}

‎apps/sim/app/api/tools/airtable/tables/route.ts‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
import { createLogger } from '@sim/logger'
2+
import { NextResponse } from 'next/server'
3+
import { authorizeCredentialUse } from '@/lib/auth/credential-access'
4+
import { validateAirtableId } from '@/lib/core/security/input-validation'
5+
import { generateRequestId } from '@/lib/core/utils/request'
6+
import { refreshAccessTokenIfNeeded } from '@/app/api/auth/oauth/utils'
7+
8+
const logger = createLogger('AirtableTablesAPI')
9+
10+
export const dynamic = 'force-dynamic'
11+
12+
export async function POST(request: Request) {
13+
const requestId = generateRequestId()
14+
try {
15+
const body = await request.json()
16+
const { credential, workflowId, baseId } = body
17+
18+
if (!credential) {
19+
logger.error('Missing credential in request')
20+
return NextResponse.json({ error: 'Credential is required' }, { status: 400 })
21+
}
22+
23+
if (!baseId) {
24+
logger.error('Missing baseId in request')
25+
return NextResponse.json({ error: 'Base ID is required' }, { status: 400 })
26+
}
27+
28+
const baseIdValidation = validateAirtableId(baseId, 'app', 'baseId')
29+
if (!baseIdValidation.isValid) {
30+
logger.error('Invalid baseId', { error: baseIdValidation.error })
31+
return NextResponse.json({ error: baseIdValidation.error }, { status: 400 })
32+
}
33+
34+
const authz = await authorizeCredentialUse(request as any, {
35+
credentialId: credential,
36+
workflowId,
37+
})
38+
if (!authz.ok || !authz.credentialOwnerUserId) {
39+
return NextResponse.json({ error: authz.error || 'Unauthorized' }, { status: 403 })
40+
}
41+
42+
const accessToken = await refreshAccessTokenIfNeeded(
43+
credential,
44+
authz.credentialOwnerUserId,
45+
requestId
46+
)
47+
if (!accessToken) {
48+
logger.error('Failed to get access token', {
49+
credentialId: credential,
50+
userId: authz.credentialOwnerUserId,
51+
})
52+
return NextResponse.json(
53+
{ error: 'Could not retrieve access token', authRequired: true },
54+
{ status: 401 }
55+
)
56+
}
57+
58+
const response = await fetch(
59+
`https://api.airtable.com/v0/meta/bases/${baseIdValidation.sanitized}/tables`,
60+
{
61+
headers: {
62+
Authorization: `Bearer ${accessToken}`,
63+
'Content-Type': 'application/json',
64+
},
65+
}
66+
)
67+
68+
if (!response.ok) {
69+
const errorData = await response.json().catch(() => ({}))
70+
logger.error('Failed to fetch Airtable tables', {
71+
status: response.status,
72+
error: errorData,
73+
baseId,
74+
})
75+
return NextResponse.json(
76+
{ error: 'Failed to fetch Airtable tables', details: errorData },
77+
{ status: response.status }
78+
)
79+
}
80+
81+
const data = await response.json()
82+
const tables = (data.tables || []).map((table: { id: string; name: string }) => ({
83+
id: table.id,
84+
name: table.name,
85+
}))
86+
87+
return NextResponse.json({ tables })
88+
} catch (error) {
89+
logger.error('Error processing Airtable tables request:', error)
90+
return NextResponse.json(
91+
{ error: 'Failed to retrieve Airtable tables', details: (error as Error).message },
92+
{ status: 500 }
93+
)
94+
}
95+
}

‎apps/sim/app/api/tools/asana/workspaces/route.ts‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
import { createLogger } from '@sim/logger'
2+
import { NextResponse } from 'next/server'
3+
import { authorizeCredentialUse } from '@/lib/auth/credential-access'
4+
import { generateRequestId } from '@/lib/core/utils/request'
5+
import { refreshAccessTokenIfNeeded } from '@/app/api/auth/oauth/utils'
6+
7+
const logger = createLogger('AsanaWorkspacesAPI')
8+
9+
export const dynamic = 'force-dynamic'
10+
11+
export async function POST(request: Request) {
12+
const requestId = generateRequestId()
13+
try {
14+
const body = await request.json()
15+
const { credential, workflowId } = body
16+
17+
if (!credential) {
18+
logger.error('Missing credential in request')
19+
return NextResponse.json({ error: 'Credential is required' }, { status: 400 })
20+
}
21+
22+
const authz = await authorizeCredentialUse(request as any, {
23+
credentialId: credential,
24+
workflowId,
25+
})
26+
if (!authz.ok || !authz.credentialOwnerUserId) {
27+
return NextResponse.json({ error: authz.error || 'Unauthorized' }, { status: 403 })
28+
}
29+
30+
const accessToken = await refreshAccessTokenIfNeeded(
31+
credential,
32+
authz.credentialOwnerUserId,
33+
requestId
34+
)
35+
if (!accessToken) {
36+
logger.error('Failed to get access token', {
37+
credentialId: credential,
38+
userId: authz.credentialOwnerUserId,
39+
})
40+
return NextResponse.json(
41+
{ error: 'Could not retrieve access token', authRequired: true },
42+
{ status: 401 }
43+
)
44+
}
45+
46+
const response = await fetch('https://app.asana.com/api/1.0/workspaces', {
47+
headers: {
48+
Authorization: `Bearer ${accessToken}`,
49+
Accept: 'application/json',
50+
},
51+
})
52+
53+
if (!response.ok) {
54+
const errorData = await response.json().catch(() => ({}))
55+
logger.error('Failed to fetch Asana workspaces', {
56+
status: response.status,
57+
error: errorData,
58+
})
59+
return NextResponse.json(
60+
{ error: 'Failed to fetch Asana workspaces', details: errorData },
61+
{ status: response.status }
62+
)
63+
}
64+
65+
const data = await response.json()
66+
const workspaces = (data.data || []).map((workspace: { gid: string; name: string }) => ({
67+
id: workspace.gid,
68+
name: workspace.name,
69+
}))
70+
71+
return NextResponse.json({ workspaces })
72+
} catch (error) {
73+
logger.error('Error processing Asana workspaces request:', error)
74+
return NextResponse.json(
75+
{ error: 'Failed to retrieve Asana workspaces', details: (error as Error).message },
76+
{ status: 500 }
77+
)
78+
}
79+
}

‎apps/sim/app/api/tools/attio/lists/route.ts‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
import { createLogger } from '@sim/logger'
2+
import { NextResponse } from 'next/server'
3+
import { authorizeCredentialUse } from '@/lib/auth/credential-access'
4+
import { generateRequestId } from '@/lib/core/utils/request'
5+
import { refreshAccessTokenIfNeeded } from '@/app/api/auth/oauth/utils'
6+
7+
const logger = createLogger('AttioListsAPI')
8+
9+
export const dynamic = 'force-dynamic'
10+
11+
export async function POST(request: Request) {
12+
const requestId = generateRequestId()
13+
try {
14+
const body = await request.json()
15+
const { credential, workflowId } = body
16+
17+
if (!credential) {
18+
logger.error('Missing credential in request')
19+
return NextResponse.json({ error: 'Credential is required' }, { status: 400 })
20+
}
21+
22+
const authz = await authorizeCredentialUse(request as any, {
23+
credentialId: credential,
24+
workflowId,
25+
})
26+
if (!authz.ok || !authz.credentialOwnerUserId) {
27+
return NextResponse.json({ error: authz.error || 'Unauthorized' }, { status: 403 })
28+
}
29+
30+
const accessToken = await refreshAccessTokenIfNeeded(
31+
credential,
32+
authz.credentialOwnerUserId,
33+
requestId
34+
)
35+
if (!accessToken) {
36+
logger.error('Failed to get access token', {
37+
credentialId: credential,
38+
userId: authz.credentialOwnerUserId,
39+
})
40+
return NextResponse.json(
41+
{ error: 'Could not retrieve access token', authRequired: true },
42+
{ status: 401 }
43+
)
44+
}
45+
46+
const response = await fetch('https://api.attio.com/v2/lists', {
47+
headers: {
48+
Authorization: `Bearer ${accessToken}`,
49+
Accept: 'application/json',
50+
},
51+
})
52+
53+
if (!response.ok) {
54+
const errorData = await response.json().catch(() => ({}))
55+
logger.error('Failed to fetch Attio lists', {
56+
status: response.status,
57+
error: errorData,
58+
})
59+
return NextResponse.json(
60+
{ error: 'Failed to fetch Attio lists', details: errorData },
61+
{ status: response.status }
62+
)
63+
}
64+
65+
const data = await response.json()
66+
const lists = (data.data || []).map((list: { api_slug: string; name: string }) => ({
67+
id: list.api_slug,
68+
name: list.name,
69+
}))
70+
71+
return NextResponse.json({ lists })
72+
} catch (error) {
73+
logger.error('Error processing Attio lists request:', error)
74+
return NextResponse.json(
75+
{ error: 'Failed to retrieve Attio lists', details: (error as Error).message },
76+
{ status: 500 }
77+
)
78+
}
79+
}

0 commit comments

Comments
 (0)