Merge branch 'main' into form_data_imp

This commit is contained in:
Ashita Prasad
2024-01-06 22:50:02 +05:30
committed by GitHub
34 changed files with 1585 additions and 52 deletions

View File

@ -111,7 +111,11 @@ body = b'\r\n'.join(dataList)
"isFormDataRequest": requestModel.isFormDataRequest,
},
);
var rec = getValidRequestUri(url, requestModel.requestParams);
var rec = getValidRequestUri(
url,
requestModel.enabledRequestParams,
);
Uri? uri = rec.$1;
if (uri != null) {
@ -137,9 +141,9 @@ body = b'\r\n'.join(dataList)
}
}
var headersList = requestModel.requestHeaders;
var headersList = requestModel.enabledRequestHeaders;
if (headersList != null || hasBody) {
var headers = requestModel.headersMap;
var headers = requestModel.enabledHeadersMap;
if (requestModel.isFormDataRequest) {
var formHeaderTemplate =
jj.Template(kTemplateFormHeaderContentType);
@ -147,9 +151,12 @@ body = b'\r\n'.join(dataList)
"boundary": uuid,
});
}
if (headers.isNotEmpty || hasBody) {
hasHeaders = true;
if (hasBody) {
bool hasContentTypeHeader = headers.keys.any((k) => k.toLowerCase() == HttpHeaders.contentTypeHeader);
if (hasBody && !hasContentTypeHeader) {
headers[HttpHeaders.contentTypeHeader] =
kContentTypeMap[requestModel.requestBodyContentType] ?? "";
}

View File

@ -115,7 +115,10 @@ print('Response Body:', response.text)
url = "$defaultUriScheme://$url";
}
var rec = getValidRequestUri(url, requestModel.requestParams);
var rec = getValidRequestUri(
url,
requestModel.enabledRequestParams,
);
Uri? uri = rec.$1;
if (uri != null) {
var templateStartUrl = jj.Template(kTemplateStart);
@ -152,9 +155,9 @@ print('Response Body:', response.text)
}
}
var headersList = requestModel.requestHeaders;
var headersList = requestModel.enabledRequestHeaders;
if (headersList != null || hasBody) {
var headers = requestModel.headersMap;
var headers = requestModel.enabledHeadersMap;
if (requestModel.isFormDataRequest) {
var formHeaderTemplate =
jj.Template(kTemplateFormHeaderContentType);