fix(ios): re-implement user agent overwrite (apache#268)

This closes apache#263 apache#258
saschal-j5int · Aug 25, 2020 · 64bfd15 · 64bfd15
1 parent 2d5d351
commit 64bfd15
Showing 1 changed file with 23 additions and 25 deletions.
diff --git a/src/ios/CDVFileTransfer.m b/src/ios/CDVFileTransfer.m
@@ -103,36 +103,34 @@ - (NSString*)escapePathComponentForUrlString:(NSString*)urlString
 - (void)applyRequestHeaders:(NSDictionary*)headers toRequest:(NSMutableURLRequest*)req
 {
     [req setValue:@"XMLHttpRequest" forHTTPHeaderField:@"X-Requested-With"];
-
-    NSString* userAgent = [self.commandDelegate userAgent];
-    if (userAgent) {
+    [self.webViewEngine evaluateJavaScript:@"navigator.userAgent" completionHandler:^(NSString* userAgent, NSError* error) {
         [req setValue:userAgent forHTTPHeaderField:@"User-Agent"];
-    }
-
-    for (NSString* headerName in headers) {
-        id value = [headers objectForKey:headerName];
-        if (!value || (value == [NSNull null])) {
-            value = @"null";
-        }
-
-        // First, remove an existing header if one exists.
-        [req setValue:nil forHTTPHeaderField:headerName];
-
-        if (![value isKindOfClass:[NSArray class]]) {
-            value = [NSArray arrayWithObject:value];
-        }
 
-        // Then, append all header values.
-        for (id __strong subValue in value) {
-            // Convert from an NSNumber -> NSString.
-            if ([subValue respondsToSelector:@selector(stringValue)]) {
-                subValue = [subValue stringValue];
+        for (NSString* headerName in headers) {
+            id value = [headers objectForKey:headerName];
+            if (!value || (value == [NSNull null])) {
+                value = @"null";
+            }
+
+            // First, remove an existing header if one exists.
+            [req setValue:nil forHTTPHeaderField:headerName];
+
+            if (![value isKindOfClass:[NSArray class]]) {
+                value = [NSArray arrayWithObject:value];
             }
-            if ([subValue isKindOfClass:[NSString class]]) {
-                [req addValue:subValue forHTTPHeaderField:headerName];
+
+            // Then, append all header values.
+            for (id __strong subValue in value) {
+                // Convert from an NSNumber -> NSString.
+                if ([subValue respondsToSelector:@selector(stringValue)]) {
+                    subValue = [subValue stringValue];
+                }
+                if ([subValue isKindOfClass:[NSString class]]) {
+                    [req addValue:subValue forHTTPHeaderField:headerName];
+                }
             }
         }
-    }
+    }];
 }
 
 - (NSURLRequest*)requestForUploadCommand:(CDVInvokedUrlCommand*)command fileData:(NSData*)fileData