Merge pull request #103 from proyecto26/develop

Add waitForRedirectDelay option from Android to wait the redirection

Author: jdnichollsc

CHANGELOG.md

@@ -22,6 +22,11 @@ in case of vulnerabilities.
 
 ## [Unreleased]
 
+## [3.1.0] - 2019-09-03
+
+### Added
+- Add `waitForRedirectDelay` option for **Android** to fix issues dismissing the browser before detecting the redirection with `Linking` ([817f6ec](https://github.com/proyecto26/react-native-inappbrowser/commit/817f6ece140c0f2f84e21a537d5030403e652bc1)).
+
 ## [3.0.1] - 2019-08-16
 
 ### Added

README.md

@@ -152,6 +152,7 @@ Property       | Description
 `animations` (Object)             | Sets the start and exit animations. [`{ startEnter, startExit, endEnter, endExit }`]
 `headers` (Object)                | The data are key/value pairs, they will be sent in the HTTP request headers for the provided url. [`{ 'Authorization': 'Bearer ...' }`]
 `forceCloseOnRedirection` (Boolean) | Open Custom Tab in a new task to avoid issues redirecting back to app scheme. [`true`/`false`]
+`waitForRedirectDelay` (Number)   | Sets a delay for wait the redirection using `openAuth` method.
 
 ### Demo
 
@@ -191,7 +192,8 @@ import InAppBrowser from 'react-native-inappbrowser-reborn'
           },
           headers: {
             'my-custom-header': 'my custom header value'
-          }
+          },
+          waitForRedirectDelay: 0
         })
         Alert.alert(JSON.stringify(result))
       }
@@ -264,6 +266,7 @@ import { getDeepLink } from './utilities'
           showTitle: false,
           enableUrlBarHiding: true,
           enableDefaultShare: true,
+          waitForRedirectDelay: 1000
         }).then((response) => {
           if (response.type === 'success' &&
             response.url) {

example/App.js

@@ -102,13 +102,19 @@ export default class App extends Component {
   }
 
   async tryDeepLinking() {
-    const loginUrl =
-      'https://proyecto26.github.io/react-native-inappbrowser/';
+    const loginUrl = 'https://proyecto26.github.io/react-native-inappbrowser/';
     const redirectUrl = encodeURIComponent(this.getDeepLink('home'));
     const url = `${loginUrl}?redirect_url=${redirectUrl}`;
     try {
       if (await InAppBrowser.isAvailable()) {
-        const result = await InAppBrowser.openAuth(url, redirectUrl);
+        const result = await InAppBrowser.openAuth(url, redirectUrl, {
+          showTitle: true,
+          toolbarColor: '#6200EE',
+          secondaryToolbarColor: 'black',
+          enableUrlBarHiding: true,
+          enableDefaultShare: true,
+          waitForRedirectDelay: 1000
+        });
         await this.sleep(800);
         Alert.alert('Response', JSON.stringify(result));
       } else {

example/yarn.lock

@@ -49,7 +49,8 @@ declare module 'react-native-inappbrowser-reborn' {
       endEnter: string,
       endExit: string
     },
-    headers?: { [key: string]: string }
+    headers?: { [key: string]: string },
+    waitForRedirectDelay?: number
   }
 
   export type InAppBrowserOptions = InAppBrowserAndroidOptions | InAppBrowseriOSOptions;

index.d.ts

@@ -55,7 +55,8 @@ type InAppBrowserAndroidOptions = {
     endEnter: string,
     endExit: string
   },
-  headers?: { [key: string]: string }
+  headers?: { [key: string]: string },
+  waitForRedirectDelay?: number
 };
 
 type InAppBrowserOptions = InAppBrowserAndroidOptions | InAppBrowseriOSOptions;
@@ -66,25 +67,26 @@ async function open(
 ): Promise<BrowserResult> {
   const modalEnabled =
     options.modalEnabled !== undefined ? options.modalEnabled : true;
-  const inAppBrowseroptions = {
+  const inAppBrowserOptions = {
     ...options,
     url,
     dismissButtonStyle: options.dismissButtonStyle || 'close',
     readerMode: options.readerMode !== undefined ? options.readerMode : false,
     animated: options.animated !== undefined ? options.animated : true,
-    modalEnabled
+    modalEnabled,
+    waitForRedirectDelay: options.waitForRedirectDelay || 0
   };
-  if (inAppBrowseroptions.preferredBarTintColor) {
-    inAppBrowseroptions.preferredBarTintColor = processColor(
-      inAppBrowseroptions.preferredBarTintColor
+  if (inAppBrowserOptions.preferredBarTintColor) {
+    inAppBrowserOptions.preferredBarTintColor = processColor(
+      inAppBrowserOptions.preferredBarTintColor
     );
   }
-  if (inAppBrowseroptions.preferredControlTintColor) {
-    inAppBrowseroptions.preferredControlTintColor = processColor(
-      inAppBrowseroptions.preferredControlTintColor
+  if (inAppBrowserOptions.preferredControlTintColor) {
+    inAppBrowserOptions.preferredControlTintColor = processColor(
+      inAppBrowserOptions.preferredControlTintColor
     );
   }
-  return RNInAppBrowser.open(inAppBrowseroptions);
+  return RNInAppBrowser.open(inAppBrowserOptions);
 }
 
 function close(): void {
@@ -134,17 +136,23 @@ async function _openAuthSessionPolyfillAsync(
     !_redirectHandler,
     'InAppBrowser.openAuth is in a bad state. _redirectHandler is defined when it should not be.'
   );
-
+  let response = null;
   try {
-    return await Promise.race([
-      open(startUrl, options),
+    response = await Promise.race([
+      open(startUrl, options).then(result => {
+        return new Promise(resolve => {
+          // A delay to wait for the redirection or dismiss the browser instead
+          setTimeout(() => resolve(result), options.waitForRedirectDelay);
+        });
+      }),
       _waitForRedirectAsync(returnUrl)
     ]);
   } finally {
     close();
     Linking.removeEventListener('url', _redirectHandler);
     _redirectHandler = null;
   }
+  return response;
 }
 
 function _waitForRedirectAsync(returnUrl: string): Promise<RedirectResult> {

index.js

@@ -1,6 +1,6 @@
 {
   "name": "react-native-inappbrowser-reborn",
-  "version": "3.0.1",
+  "version": "3.1.0",
   "description": "InAppBrowser for React Native",
   "main": "index.js",
   "readmeFilename": "README.md",