[webview_flutter_wkwebview] Fix bug of overriding default values of `…

…NSURLRequest` (flutter#5969)
yutaaraki-toydium · Aug 12, 2022 · a1af363 · a1af363
1 parent 873968e
commit a1af363
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/...ebview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFDataConvertersTests.m b/...ebview_flutter/webview_flutter_wkwebview/example/ios/RunnerTests/FWFDataConvertersTests.m
@@ -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

diff --git a/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFDataConverters.m b/packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFDataConverters.m
@@ -17,8 +17,12 @@
     return nil;
   }
 
-  [request setHTTPMethod:data.httpMethod];
-  [request setHTTPBody:data.httpBody.data];
+  if (data.httpMethod) {
+    [request setHTTPMethod:data.httpMethod];
+  }
+  if (data.httpBody) {
+    [request setHTTPBody:data.httpBody.data];
+  }
   [request setAllHTTPHeaderFields:data.allHttpHeaderFields];
 
   return request;