Skip to content

Commit 567344a

Browse files
fix(common): preserve file uploads in experimental scripting sandbox (hoppscotch#5512)
1 parent 68d1db7 commit 567344a

File tree

3 files changed

+1242
-8
lines changed

3 files changed

+1242
-8
lines changed

packages/hoppscotch-common/src/helpers/RequestRunner.ts

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ import {
6363
} from "./workers/sandbox.worker"
6464
import { transformInheritedCollectionVariablesToAggregateEnv } from "./utils/inheritedCollectionVarTransformer"
6565
import { isJSONContentType } from "./utils/contenttypes"
66+
import { applyScriptRequestUpdates } from "./experimental-sandbox-integration"
6667

6768
const sandboxWorker = new Worker(
6869
new URL("./workers/sandbox.worker.ts", import.meta.url),
@@ -468,10 +469,10 @@ export function runRESTRequest$(
468469
secret,
469470
}))
470471

471-
const finalRequest = {
472-
...resolvedRequest,
473-
...(preRequestScriptResult.right.updatedRequest ?? {}),
474-
}
472+
const finalRequest = applyScriptRequestUpdates(
473+
resolvedRequest,
474+
preRequestScriptResult.right.updatedRequest
475+
)
475476

476477
// Propagate changes to request variables from the scripting context to the UI
477478
tab.value.document.request.requestVariables = finalRequest.requestVariables
@@ -686,10 +687,10 @@ export function runTestRunnerRequest(
686687
)
687688

688689
// Calculate the final updated request after pre-request script changes
689-
const finalRequest = {
690-
...request,
691-
...(preRequestScriptResult.right.updatedRequest ?? {}),
692-
}
690+
const finalRequest = applyScriptRequestUpdates(
691+
request,
692+
preRequestScriptResult.right.updatedRequest
693+
)
693694

694695
const effectiveRequest = await getEffectiveRESTRequest(finalRequest, {
695696
id: "env-id",

0 commit comments

Comments
 (0)