Merge pull request #15 from cgoboncan-ebsi/master

fix(ios13): Fixing issue with changes to ASWebAuthenticationSession.

Author: jdnichollsc

CHANGELOG.md

@@ -22,6 +22,10 @@ in case of vulnerabilities.
 
 ## [Unreleased]
 
+## [2.0.1] - 2019-10-15
+### Fixed
+- **iOS:** Conform to the new iOS 13 API for ASWebAuthenticationSession. ASWebAuthenticationSession now requires a delegate that provides a display context for the authentication session. [#14](https://github.com/proyecto26/nativescript-inappbrowser/issues/14) 
+
 ## [2.0.0] - 2019-07-27
 ### Added
 - **Android:** Migrate to AndroidX by [@jdnichollsc](https://github.com/jdnichollsc) ([3e7ca9a](https://github.com/proyecto26/nativescript-inappbrowser/commit/3e7ca9a6f41f182a62b61435ef13c9c5fa043978)).

package-lock.json

@@ -56,7 +56,7 @@ const getTransitionStyle = function (styleKey: string) {
   return styles[styleKey] || UIModalTransitionStyle.CoverVertical;
 };
 
-const InAppBrowser = (<any>NSObject).extend({
+const classMembers = {
   redirectResolve: null,
   redirectReject: null,
   authSession: <SFAuthenticationSession | ASWebAuthenticationSession> null,
@@ -158,6 +158,9 @@ const InAppBrowser = (<any>NSObject).extend({
             self.flowDidFinish();
           }
         );
+        if(ios.MajorVersion >= 13) {
+          self.authSession.presentationContextProvider = self;
+        }
         self.authSession.start();
       });
     }
@@ -185,6 +188,9 @@ const InAppBrowser = (<any>NSObject).extend({
       this.close();
     }
   },
+  presentationAnchorForWebAuthenticationSession: function (session: ASWebAuthenticationSession): UIWindow {
+    return UIApplication.sharedApplication.keyWindow;
+  },
   dismissWithoutAnimation(controller: SFSafariViewController): void {
     const transition = CATransition.animation();
     transition.duration = 0.0;
@@ -229,8 +235,18 @@ const InAppBrowser = (<any>NSObject).extend({
     this.redirectReject = reject;
     return true;
   }
-}, {
-  protocols: [SFSafariViewControllerDelegate]
-});
+};
+
+const nativeSignatures =
+  ios.MajorVersion >= 13
+    ? {
+        protocols: [
+          SFSafariViewControllerDelegate,
+          ASWebAuthenticationPresentationContextProviding
+        ]
+      }
+    : { protocols: [SFSafariViewControllerDelegate] };
+
+const InAppBrowser = (<any>NSObject).extend(classMembers, nativeSignatures);
 
-export default InAppBrowser.new();
+export default InAppBrowser.new();

src/InAppBrowser.ios.ts

@@ -1,6 +1,6 @@
 {
   "name": "nativescript-inappbrowser",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "InAppBrowser for NativeScript",
   "main": "InAppBrowser",
   "typings": "index.d.ts",

src/package-lock.json

@@ -1,3 +1,5 @@
 /// <reference path="./node_modules/tns-platform-declarations/ios.d.ts" />
 /// <reference path="./node_modules/tns-platform-declarations/android.d.ts" />
-/// <reference path="./types/android.d.ts" />
+/// <reference path="./types/android.d.ts" />
+/// <reference path="./types/ios.d.ts" />
+

src/package.json

@@ -0,0 +1,36 @@
+interface ASWebAuthenticationPresentationContextProviding
+  extends NSObjectProtocol {
+  presentationAnchorForWebAuthenticationSession(
+    session: ASWebAuthenticationSession
+  ): UIWindow;
+}
+
+declare var ASWebAuthenticationPresentationContextProviding: {
+  prototype: ASWebAuthenticationPresentationContextProviding;
+};
+
+declare class ASWebAuthenticationSession extends NSObject {
+  static alloc(): ASWebAuthenticationSession; // inherited from NSObject
+
+  static new(): ASWebAuthenticationSession; // inherited from NSObject
+
+  prefersEphemeralWebBrowserSession: boolean;
+
+  presentationContextProvider: ASWebAuthenticationPresentationContextProviding;
+
+  constructor(o: {
+    URL: NSURL;
+    callbackURLScheme: string;
+    completionHandler: (p1: NSURL, p2: NSError) => void;
+  });
+
+  cancel(): void;
+
+  initWithURLCallbackURLSchemeCompletionHandler(
+    URL: NSURL,
+    callbackURLScheme: string,
+    completionHandler: (p1: NSURL, p2: NSError) => void
+  ): this;
+
+  start(): boolean;
+}