fix: useLegacy should be a request option

Author: farfromrefug

README.md

@@ -142,18 +142,24 @@ export interface HttpsSSLPinningOptions {
 	allowInvalidCertificates?: boolean
 	validatesDomainName?: boolean
 	commonName?: string
+}
+import { HttpRequestOptions } from 'tns-core-modules/http';
+export interface HttpsRequestOptions extends HTTPOptions{
 	useLegacy?: boolean
 	cachePolicy?: 'noCache' | 'onlyCache' | 'ignoreCache'
 	onProgress?: (current: number, total: number) => void
 }
 ```
-Option | Description
+SSLPinning Option | Description
 ------------ | -------------
 `host: string` | This must be the request domain name eg `sales.company.org`.
 `commonName?: string` | Default: options.host, set if certificate CN is different from the host eg `*.company.org` (Android specific)
 `certificate: string` | The uri path to your `.cer` certificate file.
 `allowInvalidCertificates?: boolean` | Default: `false`. This should **always** be `false` if you are using SSL pinning. Set this to `true` if you're using a self-signed certificate.
 `validatesDomainName?: boolean` | Default: `true`. Determines if the domain name should be validated with your pinned certificate.
+
+Requests Option | Description
+------------ | -------------
 `useLegacy?: boolean` | Default: `false`. [IOS only] set to true in order to get the response data (when status >= 300)in the `content` directly instead of `response.body.content`.
 `cachePolicy?: 'noCache' | 'onlyCache' | 'ignoreCache'` | Set the cache policy to use with that request. This only works with GET requests for now.
 `onProgress?: (current: number, total: number) => void` | [IOS only] Set the progress callback.

src/https.common.d.ts

@@ -1,11 +1,10 @@
-import { Headers } from 'tns-core-modules/http';
+import { Headers, HttpRequestOptions } from 'tns-core-modules/http';
 export interface HttpsSSLPinningOptions {
     host: string;
     certificate: string;
     allowInvalidCertificates?: boolean;
     validatesDomainName?: boolean;
     commonName?: string;
-    useLegacy?: boolean;
 }
 export interface CacheOptions {
     diskLocation: string;
@@ -22,7 +21,7 @@ export interface HttpsRequestObject {
     [key: string]: string | number | boolean | HttpsRequestObject | Array<any> | HttpsFormDataParam;
 }
 export declare type CachePolicy = 'noCache' | 'onlyCache' | 'ignoreCache';
-export interface HttpsRequestOptions {
+export interface HttpsRequestOptions extends HttpRequestOptions {
     url: string;
     method: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH' | 'HEAD';
     headers?: Headers;
@@ -33,6 +32,7 @@ export interface HttpsRequestOptions {
     timeout?: number;
     onProgress?: (current: number, total: number) => void;
     cachePolicy?: CachePolicy;
+    useLegacy?: boolean;
 }
 export interface HttpsResponse {
     headers?: Headers;

src/https.common.ts

@@ -1,12 +1,11 @@
-import { Headers } from 'tns-core-modules/http';
+import { Headers, HttpRequestOptions } from 'tns-core-modules/http';
 
 export interface HttpsSSLPinningOptions {
   host: string;
   certificate: string;
   allowInvalidCertificates?: boolean;
   validatesDomainName?: boolean;
   commonName?: string;
-  useLegacy?: boolean;
 }
 export interface CacheOptions {
   diskLocation: string;
@@ -27,7 +26,7 @@ export interface HttpsRequestObject {
 
 
 export type CachePolicy = 'noCache' | 'onlyCache' | 'ignoreCache'; 
-export interface HttpsRequestOptions {
+export interface HttpsRequestOptions extends HttpRequestOptions {
   url: string;
   method: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH' | 'HEAD';
   headers?: Headers;
@@ -51,6 +50,7 @@ export interface HttpsRequestOptions {
   onProgress?: (current: number, total: number) => void
 
   cachePolicy?:CachePolicy
+  useLegacy?: boolean;
 }
 
 export interface HttpsResponse {

src/https.ios.ts

@@ -5,8 +5,6 @@ import {
 } from "tns-core-modules/utils/types";
 import * as Https from "./https.common";
 
-let useLegacy: boolean = false;
-
 let cache: NSURLCache;
 
 export function setCache(options?: Https.CacheOptions) {
@@ -59,7 +57,6 @@ export function enableSSLPinning(options: Https.HttpsSSLPinningOptions) {
         let data = NSData.dataWithContentsOfFile(options.certificate);
         policies.secure.pinnedCertificates = NSSet.setWithObject(data);
     }
-    useLegacy = isDefined(options.useLegacy) ? options.useLegacy : false;
     policies.secured = true;
     console.log("nativescript-https > Enabled SSL pinning");
 }
@@ -84,7 +81,8 @@ function AFFailure(
     resolve,
     reject,
     task: NSURLSessionDataTask,
-    error: NSError
+    error: NSError,
+    useLegacy: boolean
 ) {
     let data: NSDictionary<string, any> &
         NSData &
@@ -219,11 +217,14 @@ export function request(
                 ? opts.timeout
                 : 10;
 
+     
+            const useLegacy = isDefined(opts.useLegacy) ? opts.useLegacy : false;
+    
             const success = function (task: NSURLSessionDataTask, data?: any) {
                 AFSuccess(resolve, task, data);
             };
             const failure = function (task: NSURLSessionDataTask, error: any) {
-                AFFailure(resolve, reject, task, error);
+                AFFailure(resolve, reject, task, error, useLegacy);
             };
 
             const progress = opts.onProgress ? (progress: NSProgress) => {