Add new option followRedirect to fetch request and related test case #230

Author: wkh237

src/android/src/main/java/com/RNFetchBlob/RNFetchBlobConfig.java

@@ -19,6 +19,7 @@ public class RNFetchBlobConfig {
     public Boolean overwrite = true;
     public long timeout = 60000;
     public Boolean increment = false;
+    public Boolean followRedirect = true;
     public ReadableArray binaryContentTypes = null;
 
     RNFetchBlobConfig(ReadableMap options) {
@@ -36,9 +37,11 @@ public class RNFetchBlobConfig {
         if(this.path != null && path.toLowerCase().contains("?append=true")) {
             this.overwrite = false;
         }
-
         if(options.hasKey("overwrite"))
             this.overwrite = options.getBoolean("overwrite");
+        if(options.hasKey("followRedirect")) {
+            this.followRedirect = options.getBoolean("followRedirect");
+        }
         this.key = options.hasKey("key") ? options.getString("key") : null;
         this.mime = options.hasKey("contentType") ? options.getString("contentType") : null;
         this.increment = options.hasKey("increment") ? options.getBoolean("increment") : false;

src/android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java

@@ -362,7 +362,8 @@ public Response intercept(Chain chain) throws IOException {
 
             clientBuilder.connectionPool(pool);
             clientBuilder.retryOnConnectionFailure(false);
-            clientBuilder.followRedirects(true);
+            clientBuilder.followRedirects(options.followRedirect);
+            clientBuilder.followSslRedirects(options.followRedirect);
 
 
             OkHttpClient client = clientBuilder.retryOnConnectionFailure(true).build();

src/ios/RNFetchBlobNetwork.m

@@ -86,6 +86,7 @@ @interface RNFetchBlobNetwork ()
     NSInteger respStatus;
     NSMutableArray * redirects;
     ResponseFormat responseFormat;
+    BOOL * followRedirect;
 }
 
 @end
@@ -214,6 +215,7 @@ - (void) sendRequest:(__weak NSDictionary  * _Nullable )options
     self.expectedBytes = 0;
     self.receivedBytes = 0;
     self.options = options;
+    followRedirect = [options valueForKey:@"followRedirect"] == nil ? YES : [[options valueForKey:@"followRedirect"] boolValue];
     isIncrement = [options valueForKey:@"increment"] == nil ? NO : [[options valueForKey:@"increment"] boolValue];
     redirects = [[NSMutableArray alloc] init];
     if(req.URL != nil)
@@ -236,8 +238,15 @@ - (void) sendRequest:(__weak NSDictionary  * _Nullable )options
     bodyLength = contentLength;
 
     // the session trust any SSL certification
-//    NSURLSessionConfiguration *defaultConfigObject = [NSURLSessionConfiguration defaultSessionConfiguration];
-    NSURLSessionConfiguration *defaultConfigObject = [NSURLSessionConfiguration backgroundSessionConfigurationWithIdentifier:taskId];
+    NSURLSessionConfiguration *defaultConfigObject;
+    if(!followRedirect)
+    {
+        defaultConfigObject = [NSURLSessionConfiguration defaultSessionConfiguration];
+    }
+    else
+    {
+        NSURLSessionConfiguration *defaultConfigObject = [NSURLSessionConfiguration backgroundSessionConfigurationWithIdentifier:taskId];
+    }
 
     // set request timeout
     float timeout = [options valueForKey:@"timeout"] == nil ? -1 : [[options valueForKey:@"timeout"] floatValue];
@@ -275,7 +284,7 @@ - (void) sendRequest:(__weak NSDictionary  * _Nullable )options
         respData = [[NSMutableData alloc] init];
         respFile = NO;
     }
-
+    
     __block NSURLSessionDataTask * task = [session dataTaskWithRequest:req];
     [taskTable setObject:task forKey:taskId];
     [task resume];
@@ -284,15 +293,14 @@ - (void) sendRequest:(__weak NSDictionary  * _Nullable )options
     if([[options objectForKey:CONFIG_INDICATOR] boolValue] == YES)
         [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:YES];
     __block UIApplication * app = [UIApplication sharedApplication];
-
+    
     // #115 handling task expired when application entering backgound for a long time
     UIBackgroundTaskIdentifier tid = [app beginBackgroundTaskWithName:taskId expirationHandler:^{
         NSLog([NSString stringWithFormat:@"session %@ expired", taskId ]);
         [expirationTable setObject:task forKey:taskId];
         [app endBackgroundTask:tid];
     }];
 
-
 }
 
 // #115 Invoke fetch.expire event on those expired requests so that the expired event can be handled
@@ -575,7 +583,7 @@ - (void) URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didCom
                 respStr = [respData base64EncodedStringWithOptions:0];
             }
         }
-        }
+    }
 
 
     callback(@[ errMsg, rnfbRespType, respStr]);
@@ -644,9 +652,17 @@ - (void) URLSessionDidFinishEventsForBackgroundURLSession:(NSURLSession *)sessio
 
 - (void) URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task willPerformHTTPRedirection:(NSHTTPURLResponse *)response newRequest:(NSURLRequest *)request completionHandler:(void (^)(NSURLRequest * _Nullable))completionHandler
 {
-    if(request.URL != nil)
-        [redirects addObject:[request.URL absoluteString]];
-    completionHandler(request);
+    
+    if(followRedirect)
+    {
+        if(request.URL != nil)
+            [redirects addObject:[request.URL absoluteString]];
+        completionHandler(request);
+    }
+    else
+    {
+        completionHandler(nil);
+    }
 }
 
 @end

test/test-0.10.2.js

@@ -48,3 +48,16 @@ describe('#227 IOS file modification date correctness', (report, done) => {
   })
 
 })
+
+describe('#230 add and option for setting if the request follow redirect or not', (report, done) => {
+
+  RNFetchBlob
+  .config({ followRedirect : false })
+  .fetch('GET',`${TEST_SERVER_URL}/redirect`)
+  .then((res) => {
+    console.log(res.data)
+    report(<Assert key="should not redirect twice" expect={1} actual={res.info().redirects.length}/>);
+    done();
+  })
+
+})