@@ -202,29 +202,27 @@ IAsyncOperation<HttpRequestMessage> WinRTHttpResource::CreateRequest(
202
202
content = HttpStreamContent{std::move (stream)};
203
203
} else if (data.find (" formData" ) != data.cend ()) {
204
204
winrt::Windows::Web::Http::HttpMultipartFormDataContent multiPartContent;
205
- auto &formData = data[" formData" ].AsObject ();
205
+ auto &formData = data[" formData" ].AsArray ();
206
206
207
207
// #6046 - Overwriting WinRT's HttpMultipartFormDataContent implicit Content-Type clears the generated boundary
208
208
contentType = nullptr ;
209
209
210
210
for (auto &formDataPart : formData) {
211
211
IHttpContent formContent{nullptr };
212
- auto &itr = formDataPart.second [ " string " ] ;
213
- if (!formDataPart. second [" string" ].IsNull ()) {
214
- formContent = HttpStringContent{to_hstring (formDataPart. second [" string" ].AsString ())};
215
- } else if (!formDataPart. second [" uri" ].IsNull ()) {
216
- auto filePath = to_hstring (formDataPart. second [" uri" ].AsString ());
212
+ auto &formDataPartObj = formDataPart.AsObject () ;
213
+ if (!formDataPartObj [" string" ].IsNull ()) {
214
+ formContent = HttpStringContent{to_hstring (formDataPartObj [" string" ].AsString ())};
215
+ } else if (!formDataPartObj [" uri" ].IsNull ()) {
216
+ auto filePath = to_hstring (formDataPartObj [" uri" ].AsString ());
217
217
auto file = co_await StorageFile::GetFileFromPathAsync (filePath);
218
218
auto stream = co_await file.OpenReadAsync ();
219
219
formContent = HttpStreamContent{stream};
220
220
}
221
-
222
221
if (formContent) {
223
- AttachMultipartHeaders (formContent, formDataPart. second [" headers" ].AsObject ());
224
- multiPartContent.Add (formContent, to_hstring (formDataPart. second [" fieldName" ].AsString ()));
222
+ AttachMultipartHeaders (formContent, formDataPartObj [" headers" ].AsObject ());
223
+ multiPartContent.Add (formContent, to_hstring (formDataPartObj [" fieldName" ].AsString ()));
225
224
}
226
225
} // foreach form data part
227
-
228
226
content = multiPartContent;
229
227
}
230
228
}
0 commit comments