Merge branch 'master' into develop

# Conflicts:
#	package.json
#	yarn.lock

Author: jdnichollsc

.eslintrc

@@ -1,7 +1,7 @@
 {
   "extends": "@react-native-community",
   "rules": {
-    "comma-dangle": ["error", {
+    "comma-dangle": ["error", "always-multiline", {
       "arrays": "never",
       "objects": "never",
       "imports": "never",

CHANGELOG.md

@@ -22,6 +22,15 @@ in case of vulnerabilities.
 
 ## [Unreleased]
 
+## [3.4.0] - 2020-04-08
+
+### Added
+- Added `ephemeralWebSession` option to supports `ephemeralWebBrowserSession` on iOS 13 by [@avenner](https://github.com/avenner) ([#141](https://github.com/proyecto26/react-native-inappbrowser/pull/141)).
+- Add `@ReactModule` annotation by [@janicduplessis](https://github.com/janicduplessis) ([#94](https://github.com/proyecto26/react-native-inappbrowser/pull/94)).
+
+### Fixed
+- Remove listener of `openAuth` when `closeAuth` is called.
+
 ## [3.3.4] - 2020-01-07
 
 ### Fixed
@@ -145,7 +154,8 @@ Missing tags for previous versions 🤷‍♂
 - Fix `EventBusException` on **Android** by [@Almouro](https://github.com/Almouro) ([9cf4cbb](https://github.com/proyecto26/react-native-inappbrowser/commit/9cf4cbb58d55c8b534dabac6791e6a2a5428253f)).
 
 
-[Unreleased]: https://github.com/proyecto26/react-native-inappbrowser/compare/v3.3.4...HEAD
+[Unreleased]: https://github.com/proyecto26/react-native-inappbrowser/compare/v3.4.0...HEAD
+[3.4.0]: https://github.com/proyecto26/react-native-inappbrowser/compare/v3.3.4...v3.4.0
 [3.3.4]: https://github.com/proyecto26/react-native-inappbrowser/compare/v3.3.3...v3.3.4
 [3.3.3]: https://github.com/proyecto26/react-native-inappbrowser/compare/v3.3.2...v3.3.3
 [3.3.2]: https://github.com/proyecto26/react-native-inappbrowser/compare/v3.3.1...v3.3.2

README.md

@@ -144,11 +144,13 @@ Property       | Description
 `modalTransitionStyle` (String)      | The transition style to use when presenting the view controller. [`coverVertical`/`flipHorizontal`/`crossDissolve`/`partialCurl`]
 `modalEnabled` (Boolean)             | Present the **SafariViewController** modally or as push instead. [`true`/`false`]
 `enableBarCollapsing` (Boolean)      | Determines whether the browser's tool bars will collapse or not. [`true`/`false`]
+`ephemeralWebSession` (Boolean)      | Prevent re-use cookies of previous session (openAuth only) [`true`/`false`]
 
 ### Android Options
 Property       | Description
 -------------- | ------
 `showTitle` (Boolean)   | Sets whether the title should be shown in the custom tab. [`true`/`false`]
+`hasBackButton` (Boolean)   | Sets a back arrow instead of the default X icon to close the custom tab. [`true`/`false`]
 `toolbarColor` (String)           | Sets the toolbar color. [`gray`/`#808080`]
 `secondaryToolbarColor` (String)  | Sets the color of the secondary toolbar. [`white`/`#FFFFFF`]
 `enableUrlBarHiding` (Boolean)    | Enables the url bar to hide as the user scrolls down on the page. [`true`/`false`]
@@ -175,7 +177,7 @@ import InAppBrowser from 'react-native-inappbrowser-reborn'
           preferredControlTintColor: 'white',
           readerMode: false,
           animated: true,
-          modalPresentationStyle: 'overFullScreen',
+          modalPresentationStyle: 'fullScreen',
           modalTransitionStyle: 'partialCurl',
           modalEnabled: true,
           enableBarCollapsing: false,
@@ -295,14 +297,16 @@ import { getDeepLink } from './utilities'
       if (await InAppBrowser.isAvailable()) {
         InAppBrowser.openAuth(url, deepLink, {
           // iOS Properties
-          dismissButtonStyle: 'cancel',
+          ephemeralWebSession: false,
           // Android Properties
           showTitle: false,
           enableUrlBarHiding: true,
-          enableDefaultShare: true
+          enableDefaultShare: false
         }).then((response) => {
-          if (response.type === 'success' &&
-            response.url) {
+          if (
+            response.type === 'success' &&
+            response.url
+          ) {
             Linking.openURL(response.url)
           }
         })
@@ -319,7 +323,7 @@ import { getDeepLink } from './utilities'
 ...
   async componentDidMount() {
     // Play Lottie Animation :)
-    
+
     // Validate the stored access token (Maybe with a request)
     // Redirect the user to the Home page if the token is still valid
     // Otherwise redirect to the Login page
@@ -339,7 +343,7 @@ import { getDeepLink } from './utilities'
       // Show error and redirect the user to the Login page
     }
   }
-  
+
   async loadUserInfo() {
     const { navigation } = this.props
     const { state: { params } } = navigation
@@ -456,7 +460,12 @@ Support this project with your organization. Your logo will show up here with a
 ## Supporting 🍻
 I believe in Unicorns 🦄
 Support [me](http://www.paypal.me/jdnichollsc/2), if you do too.
-[Professionally supported react-native-inappbrowser-reborn is coming soon](https://tidelift.com/subscription/pkg/npm-react-native-inappbrowser-reborn?utm_source=npm-react-native-inappbrowser-reborn&utm_medium=referral&utm_campaign=readme)
+
+## Enterprise 💼
+
+Available as part of the Tidelift Subscription.
+
+The maintainers of InAppBrowser for React Native and thousands of other packages are working with Tidelift to deliver commercial support and maintenance for the open source dependencies you use to build your applications. Save time, reduce risk, and improve code health, while paying the maintainers of the exact dependencies you use. [Learn more.](https://tidelift.com/subscription/pkg/npm-react-native-inappbrowser-reborn?utm_source=npm-react-native-inappbrowser-reborn&utm_medium=referral&utm_campaign=enterprise&utm_term=repo)
 
 ## Security contact information 🚨
 To report a security vulnerability, please use the [Tidelift security contact](https://tidelift.com/security). Tidelift will coordinate the fix and disclosure.

android/src/main/java/com/proyecto26/inappbrowser/RNInAppBrowser.java

@@ -6,10 +6,13 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ResolveInfo;
 import android.graphics.Color;
+import android.graphics.BitmapFactory;
 import android.provider.Browser;
 import androidx.annotation.Nullable;
 import androidx.browser.customtabs.CustomTabsIntent;
+import androidx.core.graphics.ColorUtils;
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Promise;
@@ -23,6 +26,7 @@
 import org.greenrobot.eventbus.Subscribe;
 
 import java.util.regex.Pattern;
+import java.util.List;
 
 public class RNInAppBrowser {
   private final static String ERROR_CODE = "InAppBrowser";
@@ -38,8 +42,10 @@ public class RNInAppBrowser {
   private static final String KEY_ANIMATION_START_EXIT = "startExit";
   private static final String KEY_ANIMATION_END_ENTER = "endEnter";
   private static final String KEY_ANIMATION_END_EXIT = "endExit";
+  private static final String HASBACKBUTTON = "hasBackButton";
 
   private @Nullable Promise mOpenBrowserPromise;
+  private Boolean isLightTheme;
   private Activity currentActivity;
   private static final Pattern animationIdentifierPattern = Pattern.compile("^.+:.+/");
 
@@ -66,6 +72,7 @@ public void open(Context context, final ReadableMap options, final Promise promi
       final String colorString = options.getString(KEY_TOOLBAR_COLOR);
       try {
         builder.setToolbarColor(Color.parseColor(colorString));
+        isLightTheme = toolbarIsLight(colorString);
       } catch (IllegalArgumentException e) {
         throw new JSApplicationIllegalArgumentException(
                 "Invalid toolbar color '" + colorString + "': " + e.getMessage());
@@ -92,6 +99,11 @@ public void open(Context context, final ReadableMap options, final Promise promi
       final ReadableMap animations = options.getMap(KEY_ANIMATIONS);
       applyAnimation(context, builder, animations);
     }
+    if (options.hasKey(HASBACKBUTTON) &&
+            options.getBoolean(HASBACKBUTTON)) {
+      builder.setCloseButtonIcon(BitmapFactory.decodeResource(
+            context.getResources(), isLightTheme ? R.drawable.ic_arrow_back_black : R.drawable.ic_arrow_back_white));
+    }
 
     CustomTabsIntent customTabsIntent = builder.build();
 
@@ -162,6 +174,12 @@ public void close() {
         ChromeTabsManagerActivity.createDismissIntent(currentActivity));
   }
 
+  public void isAvailable(Context context, final Promise promise) {
+    Intent serviceIntent = new Intent("android.support.customtabs.action.CustomTabsService");
+    List<ResolveInfo> resolveInfos = context.getPackageManager().queryIntentServices(serviceIntent, 0);
+    promise.resolve(!(resolveInfos == null || resolveInfos.isEmpty()));
+  }
+
   @Subscribe
   public void onEvent(ChromeTabsDismissedEvent event) {
     unRegisterEventBus();
@@ -218,4 +236,8 @@ private void unRegisterEventBus() {
       EventBus.getDefault().unregister(this);
     }
   }
+
+  private Boolean toolbarIsLight(String themeColor) {
+    return ColorUtils.calculateLuminance(Color.parseColor(themeColor)) > 0.5;
+  }
 }

android/src/main/java/com/proyecto26/inappbrowser/RNInAppBrowserModule.java

@@ -7,8 +7,12 @@
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.module.annotations.ReactModule;
 
+@ReactModule(name = RNInAppBrowserModule.NAME)
 public class RNInAppBrowserModule extends ReactContextBaseJavaModule {
+  public final static String NAME = "RNInAppBrowser";
+
   private final RNInAppBrowser inAppBrowser;
   private final ReactApplicationContext reactContext;
 
@@ -20,7 +24,7 @@ public RNInAppBrowserModule(ReactApplicationContext reactContext) {
 
   @Override
   public String getName() {
-    return "RNInAppBrowser";
+    return NAME;
   }
 
   @ReactMethod
@@ -33,4 +37,9 @@ public void open(final ReadableMap options, final Promise promise) {
   public void close() {
     inAppBrowser.close();
   }
-}
+
+  @ReactMethod
+  public void isAvailable(final Promise promise) {
+    inAppBrowser.isAvailable(this.reactContext, promise);
+  }
+}

android/src/main/res/drawable-hdpi/ic_arrow_back_black.png

@@ -1,17 +1,4 @@
 module.exports = {
   root: true,
   extends: '@react-native-community',
-  rules: {
-    "comma-dangle": ["error", {
-      "arrays": "never",
-      "objects": "never",
-      "imports": "never",
-      "exports": "never",
-      "functions": "never"
-    }],
-    "prettier/prettier": ["error", {
-      "endOfLine": "auto",
-      "singleQuote": true
-    }]
-  }
 };

android/src/main/res/drawable-hdpi/ic_arrow_back_white.png

@@ -5,14 +5,6 @@
 ; Ignore "BUCK" generated dirs
 <PROJECT_ROOT>/\.buckd/
 
-; Ignore unexpected extra "@providesModule"
-.*/node_modules/.*/node_modules/fbjs/.*
-
-; Ignore duplicate module providers
-; For RN Apps installed via npm, "Libraries" folder is inside
-; "node_modules/react-native" but in the source repo it is in the root
-node_modules/react-native/Libraries/react-native/React.js
-
 ; Ignore polyfills
 node_modules/react-native/Libraries/polyfills/.*
 
@@ -21,15 +13,15 @@ node_modules/react-native/Libraries/polyfills/.*
 node_modules/warning/.*
 
 ; Flow doesn't support platforms
-.*/Libraries/Utilities/HMRLoadingView.js
+.*/Libraries/Utilities/LoadingView.js
 
 [untyped]
 .*/node_modules/@react-native-community/cli/.*/.*
 
 [include]
 
 [libs]
-node_modules/react-native/Libraries/react-native/react-native-interface.js
+node_modules/react-native/interface.js
 node_modules/react-native/flow/
 
 [options]
@@ -42,27 +34,10 @@ module.file_ext=.js
 module.file_ext=.json
 module.file_ext=.ios.js
 
-module.system=haste
-module.system.haste.use_name_reducers=true
-# get basename
-module.system.haste.name_reducers='^.*/\([a-zA-Z0-9$_.-]+\.js\(\.flow\)?\)$' -> '\1'
-# strip .js or .js.flow suffix
-module.system.haste.name_reducers='^\(.*\)\.js\(\.flow\)?$' -> '\1'
-# strip .ios suffix
-module.system.haste.name_reducers='^\(.*\)\.ios$' -> '\1'
-module.system.haste.name_reducers='^\(.*\)\.android$' -> '\1'
-module.system.haste.name_reducers='^\(.*\)\.native$' -> '\1'
-module.system.haste.paths.blacklist=.*/__tests__/.*
-module.system.haste.paths.blacklist=.*/__mocks__/.*
-module.system.haste.paths.whitelist=<PROJECT_ROOT>/node_modules/react-native/Libraries/.*
-module.system.haste.paths.whitelist=<PROJECT_ROOT>/node_modules/react-native/RNTester/.*
-module.system.haste.paths.whitelist=<PROJECT_ROOT>/node_modules/react-native/IntegrationTests/.*
-module.system.haste.paths.blacklist=<PROJECT_ROOT>/node_modules/react-native/Libraries/react-native/react-native-implementation.js
-module.system.haste.paths.blacklist=<PROJECT_ROOT>/node_modules/react-native/Libraries/Animated/src/polyfills/.*
-
 munge_underscores=true
 
-module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> 'RelativeImageStub'
+module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/node_modules/react-native/\1'
+module.name_mapper='^@?[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '<PROJECT_ROOT>/node_modules/react-native/Libraries/Image/RelativeImageStub'
 
 suppress_type=$FlowIssue
 suppress_type=$FlowFixMe
@@ -96,4 +71,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.98.0
+^0.113.0

android/src/main/res/drawable-mdpi/ic_arrow_back_black.png

@@ -20,7 +20,6 @@ DerivedData
 *.hmap
 *.ipa
 *.xcuserstate
-project.xcworkspace
 
 # Android/IntelliJ
 #
@@ -40,6 +39,7 @@ yarn-error.log
 buck-out/
 \.buckd/
 *.keystore
+!debug.keystore
 
 # fastlane
 #

android/src/main/res/drawable-mdpi/ic_arrow_back_white.png

@@ -0,0 +1,6 @@
+module.exports = {
+  bracketSpacing: false,
+  jsxBracketSameLine: true,
+  singleQuote: true,
+  trailingComma: 'all',
+};