feat(setup redirects)

Gordeev1 · Gordeev1 · commit 7b45ecbba7b0 · 2018-02-27T11:49:17.000+03:00
diff --git a/AFNetworking.d.ts b/AFNetworking.d.ts
@@ -780,7 +780,7 @@ declare class AFURLSessionManager extends NSObject implements NSCopying, NSSecur
 
 	setTaskNeedNewBodyStreamBlock(block: (p1: NSURLSession, p2: NSURLSessionTask) => NSInputStream): void;
 
-	setTaskWillPerformHTTPRedirectionBlock(block: (p1: NSURLSession, p2: NSURLSessionTask, p3: NSURLResponse, p4: NSURLRequest) => NSURLRequest): void;
+	setTaskWillPerformHTTPRedirectionBlock(block: (p1: NSURLSession, p2: NSURLSessionTask, p3: NSURLResponse, p4: NSURLRequest) => NSURLRequest | null): void;
 
 	uploadProgressForTask(task: NSURLSessionTask): NSProgress;
 
diff --git a/https.android.ts b/https.android.ts
@@ -16,6 +16,7 @@ let peer: Ipeer = {
 	allowInvalidCertificates: false,
 	validatesDomainName: true,
 }
+let followRedirects: boolean = true;
 
 export function enableSSLPinning(options: Https.HttpsSSLPinningOptions) {
 	if (!peer.host && !peer.certificate) {
@@ -57,13 +58,19 @@ export function disableSSLPinning() {
 }
 console.info('nativescript-https > Disabled SSL pinning by default')
 
+export function setupRedirects(follow: boolean) {
+	followRedirects = follow;
+	getClient(true);
+}
+
 let Client: okhttp3.OkHttpClient
 function getClient(reload: boolean = false): okhttp3.OkHttpClient {
 	if (Client && reload == false) {
 		return Client
 	}
 
-	let client = new okhttp3.OkHttpClient.Builder()
+	const client = new okhttp3.OkHttpClient.Builder().followRedirects(followRedirects);
+
 	if (peer.enabled == true) {
 		if (peer.host || peer.certificate) {
 			let spec = okhttp3.ConnectionSpec.MODERN_TLS
diff --git a/https.ios.ts b/https.ios.ts
@@ -8,6 +8,7 @@ interface Ipolicies {
 	secured: boolean
 	secure?: AFSecurityPolicy
 }
+let followRedirects: boolean = true;
 let policies: Ipolicies = {
 	def: AFSecurityPolicy.defaultPolicy(),
 	secured: false,
@@ -34,6 +35,10 @@ export function disableSSLPinning() {
 }
 console.info('nativescript-https > Disabled SSL pinning by default')
 
+export function setupRedirects(follow: boolean) {
+	followRedirects = follow;
+}
+
 function AFSuccess(resolve, task: NSURLSessionDataTask, data: NSDictionary<string, any> & NSData & NSArray<any>) {
 	let content: any
 	if (data && data.class) {
@@ -111,6 +116,8 @@ export function request(opts: Https.HttpsRequestOptions): Promise<Https.HttpsRes
 				}
 			}
 
+			manager.setTaskWillPerformHTTPRedirectionBlock((url, session, response, request) => followRedirects ? request : null);
+
 			let methods = {
 				'GET': 'GETParametersSuccessFailure',
 				'POST': 'POSTParametersSuccessFailure',

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ interface Ipolicies {`
`8`	`8`	`secured: boolean`
`9`	`9`	`secure?: AFSecurityPolicy`
`10`	`10`	`}`
	`11`	`+let followRedirects: boolean = true;`
`11`	`12`	`let policies: Ipolicies = {`
`12`	`13`	`def: AFSecurityPolicy.defaultPolicy(),`
`13`	`14`	`secured: false,`
`@@ -34,6 +35,10 @@ export function disableSSLPinning() {`
`34`	`35`	`}`
`35`	`36`	`console.info('nativescript-https > Disabled SSL pinning by default')`
`36`	`37`
	`38`	`+export function setupRedirects(follow: boolean) {`
	`39`	`+ followRedirects = follow;`
	`40`	`+}`
	`41`	`+`
`37`	`42`	`function AFSuccess(resolve, task: NSURLSessionDataTask, data: NSDictionary<string, any> & NSData & NSArray<any>) {`
`38`	`43`	`let content: any`
`39`	`44`	`if (data && data.class) {`
`@@ -111,6 +116,8 @@ export function request(opts: Https.HttpsRequestOptions): Promise<Https.HttpsRes`
`111`	`116`	`}`
`112`	`117`	`}`
`113`	`118`
	`119`	`+ manager.setTaskWillPerformHTTPRedirectionBlock((url, session, response, request) => followRedirects ? request : null);`
	`120`	`+`
`114`	`121`	`let methods = {`
`115`	`122`	`'GET': 'GETParametersSuccessFailure',`
`116`	`123`	`'POST': 'POSTParametersSuccessFailure',`