Skip to content

Commit a1af363

Browse files
bparrishMinesyutaaraki-toydium
authored andcommitted
[webview_flutter_wkwebview] Fix bug of overriding default values of NSURLRequest (flutter#5969)
1 parent 873968e commit a1af363

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

packages/webview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFDataConvertersTests.m

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,16 @@ - (void)testFWFNSURLRequestFromRequestData {
2525
XCTAssertEqualObjects(request.allHTTPHeaderFields, @{@"a" : @"header"});
2626
}
2727

28+
- (void)testFWFNSURLRequestFromRequestDataDoesNotOverrideDefaultValuesWithNull {
29+
NSURLRequest *request =
30+
FWFNSURLRequestFromRequestData([FWFNSUrlRequestData makeWithUrl:@"https://flutter.dev"
31+
httpMethod:nil
32+
httpBody:nil
33+
allHttpHeaderFields:@{}]);
34+
35+
XCTAssertEqualObjects(request.HTTPMethod, @"GET");
36+
}
37+
2838
- (void)testFWFNSHTTPCookieFromCookieData {
2939
NSHTTPCookie *cookie = FWFNSHTTPCookieFromCookieData([FWFNSHttpCookieData
3040
makeWithPropertyKeys:@[ [FWFNSHttpCookiePropertyKeyEnumData

packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFDataConverters.m

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,12 @@
1717
return nil;
1818
}
1919

20-
[request setHTTPMethod:data.httpMethod];
21-
[request setHTTPBody:data.httpBody.data];
20+
if (data.httpMethod) {
21+
[request setHTTPMethod:data.httpMethod];
22+
}
23+
if (data.httpBody) {
24+
[request setHTTPBody:data.httpBody.data];
25+
}
2226
[request setAllHTTPHeaderFields:data.allHttpHeaderFields];
2327

2428
return request;

0 commit comments

Comments
 (0)