Merge pull request #141 from avenner/patch-1

Supports ephemeralWebBrowserSession on iOS 13
proyecto26 · Feb 19, 2020 · 4c0ed7c · 4c0ed7c
2 parents 283e943 + 3725004
commit 4c0ed7c
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -144,6 +144,7 @@ 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
@@ -296,6 +297,7 @@ import { getDeepLink } from './utilities'
         InAppBrowser.openAuth(url, deepLink, {
           // iOS Properties
           dismissButtonStyle: 'cancel',
+          ephemeralWebSession: false,
           // Android Properties
           showTitle: false,
           enableUrlBarHiding: true,

diff --git a/index.d.ts b/index.d.ts
@@ -35,7 +35,8 @@ declare module 'react-native-inappbrowser-reborn' {
       | 'crossDissolve'
       | 'partialCurl',
     modalEnabled?: boolean,
-    enableBarCollapsing?: boolean
+    enableBarCollapsing?: boolean,
+    ephemeralWebSession?: boolean
   }
 
   type InAppBrowserAndroidOptions = {

diff --git a/index.js b/index.js
@@ -48,7 +48,8 @@ type InAppBrowseriOSOptions = {
     | 'crossDissolve'
     | 'partialCurl',
   modalEnabled?: boolean,
-  enableBarCollapsing?: boolean
+  enableBarCollapsing?: boolean,
+  ephemeralWebSession?: boolean
 };
 
 type InAppBrowserAndroidOptions = {
@@ -103,10 +104,15 @@ async function openAuth(
   redirectUrl: string,
   options: InAppBrowserOptions = {}
 ): Promise<AuthSessionResult> {
+  const inAppBrowserOptions = {
+    ...options,
+    ephemeralWebSession: options.ephemeralWebSession !== undefined ? options.ephemeralWebSession : false,
+  };
+
   if (_authSessionIsNativelySupported()) {
-    return RNInAppBrowser.openAuth(url, redirectUrl);
+    return RNInAppBrowser.openAuth(url, redirectUrl, inAppBrowserOptions);
   } else {
-    return _openAuthSessionPolyfillAsync(url, redirectUrl, options);
+    return _openAuthSessionPolyfillAsync(url, redirectUrl, inAppBrowserOptions);
   }
 }
 

diff --git a/ios/RNInAppBrowser.m b/ios/RNInAppBrowser.m
@@ -59,13 +59,16 @@ + (BOOL)requiresMainQueueSetup
 
 RCT_EXPORT_METHOD(openAuth:(NSString *)authURL
                   redirectURL:(NSString *)redirectURL
+                  options:(NSDictionary *)options
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 {
   if (![self initializeWebBrowserWithResolver:resolve andRejecter:reject]) {
     return;
   }
 
+  BOOL ephemeralWebSession = [options[@"ephemeralWebSession"] boolValue];
+
   if (@available(iOS 11, *)) {
     NSURL *url = [[NSURL alloc] initWithString: authURL];
     __weak typeof(self) weakSelf = self;
@@ -92,6 +95,11 @@ + (BOOL)requiresMainQueueSetup
         initWithURL:url
         callbackURLScheme:redirectURL
         completionHandler:completionHandler];
+
+      if (@available(iOS 13.0, *) && ephemeralWebSession) {
+        //Prevent re-use cookie from last auth session
+        webAuthSession.prefersEphemeralWebBrowserSession = true;
+      }
     } else {
       authSession = [[SFAuthenticationSession alloc]
         initWithURL:url