add HttpRequestOptions.dontFollowRedirects (NativeScript#3473)

dturing · enchev · commit d821c392230f · 2017-01-12T11:18:20.000+02:00
This implements the option to have http.request() not follow server's 3xx redirection replies
but instead return the exact redirection code and headers.

* on iOS, it uses a different NSURLSession instance for non-following request,
  with a NSURLSessionTaskDelegate implementing URLSessinTaskWillPerformHTTPRedirection...

* on Android, it just passes the option on to org.nativescript.widgets.Async.Http;
  so this requires the respective commit in tns-core-modules-widgets to work
diff --git a/tns-core-modules/http/http-request.android.ts b/tns-core-modules/http/http-request.android.ts
@@ -155,6 +155,9 @@ function buildJavaOptions(options: http.HttpRequestOptions) {
     if (types.isNumber(options.timeout)) {
         javaOptions.timeout = options.timeout;
     }
+    if (types.isBoolean(options.dontFollowRedirects)) {
+        javaOptions.dontFollowRedirects = options.dontFollowRedirects;
+    }
 
     if (options.headers) {
         var arrayList = new java.util.ArrayList<org.nativescript.widgets.Async.Http.KeyValuePair>();
diff --git a/tns-core-modules/http/http-request.ios.ts b/tns-core-modules/http/http-request.ios.ts
@@ -20,7 +20,28 @@ var USER_AGENT_HEADER = "User-Agent";
 var USER_AGENT = `Mozilla/5.0 (i${device}; CPU OS 6_0 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A5355d Safari/8536.25`;
 var sessionConfig = getter(NSURLSessionConfiguration, NSURLSessionConfiguration.defaultSessionConfiguration);
 var queue = getter(NSOperationQueue, NSOperationQueue.mainQueue);
-var session = NSURLSession.sessionWithConfigurationDelegateDelegateQueue(sessionConfig, null, queue);
+
+class NSURLSessionTaskDelegateImpl extends NSObject implements NSURLSessionTaskDelegate {
+    public static ObjCProtocols = [NSURLSessionTaskDelegate];
+    public URLSessionTaskWillPerformHTTPRedirectionNewRequestCompletionHandler(session: NSURLSession, task: NSURLSessionTask, response: NSHTTPURLResponse, request: NSURLRequest, completionHandler: (p1: NSURLRequest) => void): void {
+        completionHandler(null);
+    }
+}
+var sessionTaskDelegateInstance: NSURLSessionTaskDelegateImpl = <NSURLSessionTaskDelegateImpl>NSURLSessionTaskDelegateImpl.new();
+
+var defaultSession;
+function ensureDefaultSession() {
+    if (!defaultSession) {
+        defaultSession = NSURLSession.sessionWithConfigurationDelegateDelegateQueue(sessionConfig, null, queue);
+    }
+}
+
+var sessionNotFollowingRedirects;
+function ensureSessionNotFollowingRedirects() {
+    if (!sessionNotFollowingRedirects) {
+        sessionNotFollowingRedirects = NSURLSession.sessionWithConfigurationDelegateDelegateQueue(sessionConfig, sessionTaskDelegateInstance, queue);
+    }
+}
 
 var imageSource: typeof imageSourceModule;
 function ensureImageSource() {
@@ -57,6 +78,15 @@ export function request(options: http.HttpRequestOptions): Promise<http.HttpResp
                 urlRequest.timeoutInterval = options.timeout / 1000;
             }
 
+            var session;
+            if (types.isBoolean(options.dontFollowRedirects) && options.dontFollowRedirects) {
+                ensureSessionNotFollowingRedirects();
+                session = sessionNotFollowingRedirects;
+            } else {
+                ensureDefaultSession();
+                session = defaultSession;
+            }
+
             var dataTask = session.dataTaskWithRequestCompletionHandler(urlRequest,
                 function (data: NSData, response: NSHTTPURLResponse, error: NSError) {
                     if (error) {
diff --git a/tns-core-modules/http/http.d.ts b/tns-core-modules/http/http.d.ts
@@ -89,6 +89,11 @@ declare module "http" {
      * Gets or sets the request timeout in milliseconds.
      */
     timeout?: number;
+
+    /**
+     * Gets or sets wether to *not* follow server's redirection responses.
+     */
+    dontFollowRedirects?: boolean;
   }
 
   /**
diff --git a/tns-platform-declarations/android/org.nativescript.widgets.d.ts b/tns-platform-declarations/android/org.nativescript.widgets.d.ts
@@ -30,6 +30,7 @@
                         public timeout: number;
                         public screenWidth: number;
                         public screenHeight: number;
+                        public dontFollowRedirects: boolean;
                     }
 
                     export class RequestResult {

Original file line number	Diff line number	Diff line change
`@@ -155,6 +155,9 @@ function buildJavaOptions(options: http.HttpRequestOptions) {`
`155`	`155`	`if (types.isNumber(options.timeout)) {`
`156`	`156`	`javaOptions.timeout = options.timeout;`
`157`	`157`	`}`
	`158`	`+ if (types.isBoolean(options.dontFollowRedirects)) {`
	`159`	`+ javaOptions.dontFollowRedirects = options.dontFollowRedirects;`
	`160`	`+ }`
`158`	`161`
`159`	`162`	`if (options.headers) {`
`160`	`163`	`var arrayList = new java.util.ArrayList<org.nativescript.widgets.Async.Http.KeyValuePair>();`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@`
`30`	`30`	`public timeout: number;`
`31`	`31`	`public screenWidth: number;`
`32`	`32`	`public screenHeight: number;`
	`33`	`+ public dontFollowRedirects: boolean;`
`33`	`34`	`}`
`34`	`35`
`35`	`36`	`export class RequestResult {`