Skip to content

fix(jsm): resolve selector contexts server-side #7114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
BillLeoutsakosvl346 wants to merge 1 commit into from
Closed

fix(jsm): resolve selector contexts server-side #7114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 57 additions & 46 deletions apps/sim/app/api/tools/jsm/selector-requesttypes/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,20 @@ import { createLogger } from '@sim/logger'
import { type NextRequest, NextResponse } from 'next/server'
import { jsmRequestTypesSelectorContract } from '@/lib/api/contracts/selectors/jsm'
import { parseRequest } from '@/lib/api/server'
import { authorizeCredentialUse } from '@/lib/auth/credential-access'
import { validateAlphanumericId, validateJiraCloudId } from '@/lib/core/security/input-validation'
import { generateRequestId } from '@/lib/core/utils/request'
import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
import { refreshAccessTokenIfNeeded } from '@/lib/oauth/credential-service'
import { getJiraCloudId, parseAtlassianErrorMessage } from '@/tools/jira/utils'
import { resolveAtlassianSelectorCredential } from '@/lib/selectors/application/atlassian-credential'
import {
resolveSelectorProviderValue,
SELECTOR_ATLASSIAN_DISCOVERY_OPTIONS,
selectorProviderFailure,
} from '@/lib/selectors/server/provider-errors'
import {
authenticateSelectorRequest,
resolveAuthorizedSelectorContext,
} from '@/lib/selectors/server/resolve-authorized-context'
import { getJiraCloudId } from '@/tools/jira/utils'
import { getJsmApiBaseUrl, getJsmHeaders } from '@/tools/jsm/utils'

const logger = createLogger('JsmSelectorRequestTypesAPI')
Expand Down Expand Up @@ -83,20 +91,20 @@ async function fetchAllJsmRequestTypes(
export const POST = withRouteHandler(async (request: NextRequest) => {
const requestId = generateRequestId()
try {
const authentication = await authenticateSelectorRequest(request)
if (!authentication.ok) {
return NextResponse.json({ error: authentication.error }, { status: authentication.status })
}
const parsed = await parseRequest(jsmRequestTypesSelectorContract, request, {})
if (!parsed.success) return parsed.response

const { credential, workflowId, domain, serviceDeskId } = parsed.data.body
const { credential, workflowId, domain: domainReference, serviceDeskId } = parsed.data.body

if (!credential) {
logger.error('Missing credential in request')
return NextResponse.json({ error: 'Credential is required' }, { status: 400 })
}

if (!domain) {
return NextResponse.json({ error: 'Domain is required' }, { status: 400 })
}

if (!serviceDeskId) {
return NextResponse.json({ error: 'Service Desk ID is required' }, { status: 400 })
}
Expand All @@ -106,31 +114,50 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
return NextResponse.json({ error: serviceDeskIdValidation.error }, { status: 400 })
}

const authz = await authorizeCredentialUse(request, {
credentialId: credential,
const resolution = await resolveAuthorizedSelectorContext(authentication.principal, {
workflowId,
credentialId: credential,
context: { domain: domainReference },
})
if (!authz.ok || !authz.credentialOwnerUserId) {
return NextResponse.json({ error: authz.error || 'Unauthorized' }, { status: 403 })
if (!resolution.ok) {
return NextResponse.json({ error: resolution.error }, { status: resolution.status })
}

const accessToken = await refreshAccessTokenIfNeeded(
credential,
authz.credentialOwnerUserId,
requestId
)
if (!accessToken) {
logger.error('Failed to get access token', {
credentialId: credential,
userId: authz.credentialOwnerUserId,
})
const ownerUserId = resolution.credentialAccess?.credentialOwnerUserId
if (!ownerUserId) {
return NextResponse.json({ error: 'Unauthorized' }, { status: 403 })
}
const bundle = await resolveAtlassianSelectorCredential({
credentialId: credential,
credentialOwnerUserId: ownerUserId,
requestId,
serviceId: 'jira',
})
if (!bundle) {
logger.error('Failed to get JSM selector access token')
return NextResponse.json(
{ error: 'Could not retrieve access token', authRequired: true },
{ status: 401 }
)
}

const cloudId = await getJiraCloudId(domain, accessToken)
const domain = resolution.context.domain as string
const accessToken = bundle.accessToken
const cloudIdResolution = await resolveSelectorProviderValue(
'Jira Service Management',
async () =>
bundle.cloudId
? bundle.cloudId
: getJiraCloudId(domain, accessToken, SELECTOR_ATLASSIAN_DISCOVERY_OPTIONS)
)
if (!cloudIdResolution.ok) {
logger.warn('JSM selector discovery failed', {
status: cloudIdResolution.upstreamStatus ?? 'unknown',
})
return NextResponse.json(cloudIdResolution.failure, {
status: cloudIdResolution.failure.status,
})
}
const cloudId = cloudIdResolution.value

const cloudIdValidation = validateJiraCloudId(cloudId, 'cloudId')
if (!cloudIdValidation.isValid) {
Expand All @@ -143,22 +170,9 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
const { values, lastResponse } = await fetchAllJsmRequestTypes(requestTypeUrl, accessToken)

if (!lastResponse.ok) {
const errorText = await lastResponse.text()
logger.error('JSM API error:', {
status: lastResponse.status,
statusText: lastResponse.statusText,
error: errorText,
})
return NextResponse.json(
{
error: parseAtlassianErrorMessage(
lastResponse.status,
lastResponse.statusText,
errorText
),
},
{ status: lastResponse.status }
)
logger.warn('JSM selector request-type request failed', { status: lastResponse.status })
const failure = selectorProviderFailure('Jira Service Management', lastResponse.status)
return NextResponse.json(failure, { status: failure.status })
}

const requestTypes = values.map((rt) => ({
Expand All @@ -167,11 +181,8 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
}))

return NextResponse.json({ requestTypes })
} catch (error) {
logger.error('Error listing JSM request types:', error)
return NextResponse.json(
{ error: (error as Error).message || 'Internal server error' },
{ status: 500 }
)
} catch {
logger.error('Error listing JSM request types')
return NextResponse.json({ error: 'Failed to retrieve JSM request types' }, { status: 500 })
}
})
103 changes: 57 additions & 46 deletions apps/sim/app/api/tools/jsm/selector-servicedesks/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,20 @@ import { createLogger } from '@sim/logger'
import { type NextRequest, NextResponse } from 'next/server'
import { jsmServiceDesksSelectorContract } from '@/lib/api/contracts/selectors/jsm'
import { parseRequest } from '@/lib/api/server'
import { authorizeCredentialUse } from '@/lib/auth/credential-access'
import { validateJiraCloudId } from '@/lib/core/security/input-validation'
import { generateRequestId } from '@/lib/core/utils/request'
import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
import { refreshAccessTokenIfNeeded } from '@/lib/oauth/credential-service'
import { getJiraCloudId, parseAtlassianErrorMessage } from '@/tools/jira/utils'
import { resolveAtlassianSelectorCredential } from '@/lib/selectors/application/atlassian-credential'
import {
resolveSelectorProviderValue,
SELECTOR_ATLASSIAN_DISCOVERY_OPTIONS,
selectorProviderFailure,
} from '@/lib/selectors/server/provider-errors'
import {
authenticateSelectorRequest,
resolveAuthorizedSelectorContext,
} from '@/lib/selectors/server/resolve-authorized-context'
import { getJiraCloudId } from '@/tools/jira/utils'
import { getJsmApiBaseUrl, getJsmHeaders } from '@/tools/jsm/utils'

const logger = createLogger('JsmSelectorServiceDesksAPI')
Expand Down Expand Up @@ -83,45 +91,64 @@ async function fetchAllJsmServiceDesks(
export const POST = withRouteHandler(async (request: NextRequest) => {
const requestId = generateRequestId()
try {
const authentication = await authenticateSelectorRequest(request)
if (!authentication.ok) {
return NextResponse.json({ error: authentication.error }, { status: authentication.status })
}
const parsed = await parseRequest(jsmServiceDesksSelectorContract, request, {})
if (!parsed.success) return parsed.response

const { credential, workflowId, domain } = parsed.data.body
const { credential, workflowId, domain: domainReference } = parsed.data.body

if (!credential) {
logger.error('Missing credential in request')
return NextResponse.json({ error: 'Credential is required' }, { status: 400 })
}

if (!domain) {
return NextResponse.json({ error: 'Domain is required' }, { status: 400 })
}

const authz = await authorizeCredentialUse(request, {
credentialId: credential,
const resolution = await resolveAuthorizedSelectorContext(authentication.principal, {
workflowId,
credentialId: credential,
context: { domain: domainReference },
})
if (!authz.ok || !authz.credentialOwnerUserId) {
return NextResponse.json({ error: authz.error || 'Unauthorized' }, { status: 403 })
if (!resolution.ok) {
return NextResponse.json({ error: resolution.error }, { status: resolution.status })
}

const accessToken = await refreshAccessTokenIfNeeded(
credential,
authz.credentialOwnerUserId,
requestId
)
if (!accessToken) {
logger.error('Failed to get access token', {
credentialId: credential,
userId: authz.credentialOwnerUserId,
})
const ownerUserId = resolution.credentialAccess?.credentialOwnerUserId
if (!ownerUserId) {
return NextResponse.json({ error: 'Unauthorized' }, { status: 403 })
}
const bundle = await resolveAtlassianSelectorCredential({
credentialId: credential,
credentialOwnerUserId: ownerUserId,
requestId,
serviceId: 'jira',
})
if (!bundle) {
logger.error('Failed to get JSM selector access token')
return NextResponse.json(
{ error: 'Could not retrieve access token', authRequired: true },
{ status: 401 }
)
}

const cloudId = await getJiraCloudId(domain, accessToken)
const domain = resolution.context.domain as string
const accessToken = bundle.accessToken
const cloudIdResolution = await resolveSelectorProviderValue(
'Jira Service Management',
async () =>
bundle.cloudId
? bundle.cloudId
: getJiraCloudId(domain, accessToken, SELECTOR_ATLASSIAN_DISCOVERY_OPTIONS)
)
if (!cloudIdResolution.ok) {
logger.warn('JSM selector discovery failed', {
status: cloudIdResolution.upstreamStatus ?? 'unknown',
})
return NextResponse.json(cloudIdResolution.failure, {
status: cloudIdResolution.failure.status,
})
}
const cloudId = cloudIdResolution.value

const cloudIdValidation = validateJiraCloudId(cloudId, 'cloudId')
if (!cloudIdValidation.isValid) {
Expand All @@ -133,22 +160,9 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
const { values, lastResponse } = await fetchAllJsmServiceDesks(baseUrl, accessToken)

if (!lastResponse.ok) {
const errorText = await lastResponse.text()
logger.error('JSM API error:', {
status: lastResponse.status,
statusText: lastResponse.statusText,
error: errorText,
})
return NextResponse.json(
{
error: parseAtlassianErrorMessage(
lastResponse.status,
lastResponse.statusText,
errorText
),
},
{ status: lastResponse.status }
)
logger.warn('JSM selector service-desk request failed', { status: lastResponse.status })
const failure = selectorProviderFailure('Jira Service Management', lastResponse.status)
return NextResponse.json(failure, { status: failure.status })
}

const serviceDesks = values.map((sd) => ({
Expand All @@ -157,11 +171,8 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
}))

return NextResponse.json({ serviceDesks })
} catch (error) {
logger.error('Error listing JSM service desks:', error)
return NextResponse.json(
{ error: (error as Error).message || 'Internal server error' },
{ status: 500 }
)
} catch {
logger.error('Error listing JSM service desks')
return NextResponse.json({ error: 'Failed to retrieve JSM service desks' }, { status: 500 })
}
})
Loading
Loading