Change #29 IOS implementation

Author: wkh237

src/ios/RNFetchBlob/RNFetchBlob.m

@@ -160,7 +160,6 @@ - (NSDictionary *)constantsToExport
                 if([body hasPrefix:self.filePathPrefix]) {
                     NSString * orgPath = [body substringFromIndex:[self.filePathPrefix length]];
                     [request setHTTPBodyStream: [NSInputStream inputStreamWithFileAtPath:orgPath ]];
-//                    blobData = [[NSData alloc] initWithContentsOfFile:orgPath];
                 }
                 // otherwise convert it as BASE64 data string
                 else {

src/ios/RNFetchBlobNetwork.m

@@ -71,10 +71,19 @@ - (void) sendRequest:(NSDictionary  * _Nullable )options bridge:(RCTBridge * _Nu
 
     NSString * path = [self.options valueForKey:CONFIG_FILE_PATH];
     NSString * ext = [self.options valueForKey:CONFIG_FILE_EXT];
-    NSURLSessionConfiguration *defaultConfigObject = [NSURLSessionConfiguration defaultSessionConfiguration];
-    NSURLSession * session = [NSURLSession sessionWithConfiguration:defaultConfigObject delegate:self delegateQueue:taskQueue];
+    NSURLSession * session;
 
-//    NSURLSession * session = [NSURLSession sharedSession];
+    // the session trust any SSL certification
+    if([options valueForKey:CONFIG_TRUSTY] != nil)
+    {
+        NSURLSessionConfiguration *defaultConfigObject = [NSURLSessionConfiguration defaultSessionConfiguration];
+        session = [NSURLSession sessionWithConfiguration:defaultConfigObject delegate:self delegateQueue:taskQueue];
+    }
+    // the session validates SSL certification, self-signed certification will be aborted
+    else
+    {
+        session = [NSURLSession sharedSession];
+    }
 
     // file will be stored at a specific path
     if( path != nil) {
@@ -210,10 +219,10 @@ - (void) URLSessionDidFinishEventsForBackgroundURLSession:(NSURLSession *)sessio
 
 - (void) URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didReceiveChallenge:(NSURLAuthenticationChallenge *)challenge completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition, NSURLCredential * _Nullable))completionHandler
 {
-    if([options valueForKey:CONFIG_TRUSTY] == YES)
+    if([options valueForKey:CONFIG_TRUSTY] != nil)
         completionHandler(NSURLSessionAuthChallengeUseCredential, [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust]);
     else
-        RCTLogError(@"counld not create connection with an unstrusted SSL certification, if you're going to create connection anyway, add `trusty:true` to RNFetchBlob.config");
+        RCTLogWarn(@"counld not create connection with an unstrusted SSL certification, if you're going to create connection anyway, add `trusty:true` to RNFetchBlob.config");
 }
 
 @end

test/test-0.1.x-0.4.x.js

@@ -114,16 +114,3 @@ describe('Progress report test', (report, done) => {
     })
 
 })
-
-// FIXME : not yet supported
-// describe('Large file download test', (report, done) => {
-  // let received = 0
-  // RNFetchBlob.fetch('GET', `${TEST_SERVER_URL}/public/22mb-dummy`, {
-  //   Authorization : 'Bearer abde123eqweje'
-  // })
-  // .then((resp) => {
-    // report(<Assert key="not supported" expect={true} actual={false}/>)
-    // done()
-  // })
-
-// })

test/test-0.5.3.js

@@ -0,0 +1,87 @@
+import RNTest from './react-native-testkit/'
+import React from 'react'
+import RNFetchBlob from 'react-native-fetch-blob'
+
+import {
+  StyleSheet,
+  Text,
+  View,
+  ScrollView,
+  Platform,
+  Dimensions,
+  Image,
+} from 'react-native';
+
+const fs = RNFetchBlob.fs
+const { Assert, Comparer, Info, prop } = RNTest
+const describe = RNTest.config({
+  group : '0.5.3',
+  run : true,
+  expand : false,
+})
+const { TEST_SERVER_URL_SSL, FILENAME, DROPBOX_TOKEN, styles } = prop()
+
+let prefix = ((Platform.OS === 'android') ? 'file://' : '')
+
+
+describe('GET request with params', (report, done) => {
+  let time = Date.now()
+  RNFetchBlob
+  .config({ fileCache : true, trusty : true })
+    .fetch('GET', `${TEST_SERVER_URL_SSL}/params?time=${time}&name=RNFetchBlobParams&lang=中文`)
+    .then((resp) => {
+      let file = resp.path()
+      return RNFetchBlob.fs.readStream(resp.path(), 'utf8')
+    })
+    .then((stream) => {
+      let result = ''
+      stream.open()
+      stream.onData((chunk) => {
+        result += chunk
+      })
+      stream.onEnd(() => {
+        result = JSON.parse(result)
+        report(<Assert key="param#1 should correct"
+          expect={parseInt(time)}
+          actual={parseInt(result.time)}/>,
+        <Assert key="param#2 should correct"
+          expect={'RNFetchBlobParams'}
+          actual={result.name}/>,
+        <Assert key="param contains unicode data should correct"
+          expect={'中文'}
+          actual={result.lang}/>)
+          done()
+      })
+    })
+})
+
+
+describe('POST request with params', (report, done) => {
+  let time = Date.now()
+  RNFetchBlob.config({ fileCache : true, trusty : true })
+    .fetch('POST', `${TEST_SERVER_URL_SSL}/params?time=${time}&name=RNFetchBlobParams&lang=中文`)
+    .then((resp) => {
+      let file = resp.path()
+      return RNFetchBlob.fs.readStream(resp.path(), 'utf8')
+    })
+    .then((stream) => {
+      let result = ''
+      stream.open()
+      stream.onData((chunk) => {
+        result += chunk
+      })
+      stream.onEnd(() => {
+        result = JSON.parse(result)
+        report(<Assert key="param#1 should correct"
+          expect={parseInt(time)}
+          actual={parseInt(result.time)}/>,
+        <Assert key="param#2 should correct"
+          expect={'RNFetchBlobParams'}
+          actual={result.name}/>,
+        <Assert key="param contains unicode data should correct"
+          expect={'中文'}
+          actual={result.lang}/>)
+          done()
+      })
+    })
+})

test/test-init.js

@@ -54,5 +54,6 @@ describe('GET image from server', (report, done) => {
 require('./test-0.1.x-0.4.x')
 require('./test-0.5.1')
 require('./test-0.5.2')
+require('./test-0.5.3')
 require('./test-fs')
-require('./test-android')
+// require('./test-android')