fix: cors when content-type is set for simple requests

This commit is contained in:
liyasthomas
2021-08-22 22:44:07 +05:30
parent 5f27b59dc0
commit 294b1a5a7c
5 changed files with 43 additions and 20 deletions

View File

@@ -13,13 +13,17 @@ export interface EffectiveHoppRESTRequest extends HoppRESTRequest {
effectiveFinalURL: string
effectiveFinalHeaders: { key: string; value: string }[]
effectiveFinalParams: { key: string; value: string }[]
effectiveFinalBody: FormData | string
effectiveFinalBody: FormData | string | null
}
function getFinalBodyFromRequest(
request: HoppRESTRequest,
env: Environment
): FormData | string {
): FormData | string | null {
if (request.body.contentType === null) {
return null
}
if (request.body.contentType === "multipart/form-data") {
const formData = new FormData()
@@ -93,11 +97,12 @@ export function getEffectiveRESTRequest(
}
const effectiveFinalBody = getFinalBodyFromRequest(request, environment)
effectiveFinalHeaders.push({
active: true,
key: "content-type",
value: request.body.contentType,
})
if (request.body.contentType)
effectiveFinalHeaders.push({
active: true,
key: "content-type",
value: request.body.contentType,
})
return {
...request,