Skip to content

Commit c98e80a

Browse files
committed
fix(tools): restore data.error fallback with OAuth guard to avoid regression
Add data.error string check back to atlassian-errors extractor (needed for all Jira/Confluence proxy routes that return { error: "..." }), but skip it when error_description is present to avoid preempting OAuth error extraction in the backwards-compat loop. Revert JSM Forms routes to original error field.
1 parent 57044d4 commit c98e80a

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

apps/sim/app/api/tools/jsm/forms/issue/route.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ export async function POST(request: NextRequest) {
7070

7171
return NextResponse.json(
7272
{
73-
message: parseJsmErrorMessage(response.status, response.statusText, errorText),
7473
error: parseJsmErrorMessage(response.status, response.statusText, errorText),
74+
details: errorText,
7575
},
7676
{ status: response.status }
7777
)

apps/sim/app/api/tools/jsm/forms/structure/route.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ export async function POST(request: NextRequest) {
8080

8181
return NextResponse.json(
8282
{
83-
message: parseJsmErrorMessage(response.status, response.statusText, errorText),
8483
error: parseJsmErrorMessage(response.status, response.statusText, errorText),
84+
details: errorText,
8585
},
8686
{ status: response.status }
8787
)

apps/sim/app/api/tools/jsm/forms/templates/route.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ export async function POST(request: NextRequest) {
7070

7171
return NextResponse.json(
7272
{
73-
message: parseJsmErrorMessage(response.status, response.statusText, errorText),
7473
error: parseJsmErrorMessage(response.status, response.statusText, errorText),
74+
details: errorText,
7575
},
7676
{ status: response.status }
7777
)

apps/sim/tools/error-extractors.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,10 @@ const ERROR_EXTRACTORS: ErrorExtractorConfig[] = [
7474
if (errorInfo?.data?.message) {
7575
return errorInfo.data.message
7676
}
77+
// Proxy route error field fallback (skip if error_description present to avoid preempting OAuth)
78+
if (typeof errorInfo?.data?.error === 'string' && !errorInfo?.data?.error_description) {
79+
return errorInfo.data.error
80+
}
7781
return undefined
7882
},
7983
},

0 commit comments

Comments
 (0)