Skip to content
This repository has been archived by the owner on Feb 22, 2023. It is now read-only.

[webview_flutter_wkwebview] Fix bug of overriding default values of NSURLRequest #5969

Merged
merged 3 commits into from
Jun 15, 2022
Merged

[webview_flutter_wkwebview] Fix bug of overriding default values of NSURLRequest #5969

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e2da7d
null method fix
bparrishMines Jun 13, 2022
88fac14
Merge branch 'main' of github.com:flutter/plugins into mutable_request
bparrishMines Jun 14, 2022
51bdb48
unneeded null check
bparrishMines Jun 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions ...ebview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFDataConvertersTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,16 @@ - (void)testFWFNSURLRequestFromRequestData {
XCTAssertEqualObjects(request.allHTTPHeaderFields, @{@"a" : @"header"});
}

- (void)testFWFNSURLRequestFromRequestDataDoesNotOverrideDefaultValuesWithNull {
NSURLRequest *request =
FWFNSURLRequestFromRequestData([FWFNSUrlRequestData makeWithUrl:@"https://flutter.dev"
httpMethod:nil
httpBody:nil
allHttpHeaderFields:@{}]);

XCTAssertEqualObjects(request.HTTPMethod, @"GET");
}

- (void)testFWFNSHTTPCookieFromCookieData {
NSHTTPCookie *cookie = FWFNSHTTPCookieFromCookieData([FWFNSHttpCookieData
makeWithPropertyKeys:@[ [FWFNSHttpCookiePropertyKeyEnumData
Expand Down
12 changes: 9 additions & 3 deletions packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFDataConverters.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,15 @@
return nil;
}

[request setHTTPMethod:data.httpMethod];
[request setHTTPBody:data.httpBody.data];
[request setAllHTTPHeaderFields:data.allHttpHeaderFields];
if (data.httpMethod) {
[request setHTTPMethod:data.httpMethod];
}
if (data.httpBody) {
[request setHTTPBody:data.httpBody.data];
}
if (data.allHttpHeaderFields) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This check can be removed, since the property is nonnullable.

[request setAllHTTPHeaderFields:data.allHttpHeaderFields];
}

return request;
}
Expand Down