Use ASWebAuthenticationSession instead of SFAuthenticationSession (iOS >= 12)

Author: jdnichollsc

README.md

@@ -22,9 +22,8 @@
   </a>
 </p>
 
-<p align="center">
-  <h1 align="center">InAppBrowser for NativeScript</h1>
-</p>
+<h1 align="center">InAppBrowser for NativeScript</h1>
+<h4 align="center"><a href="https://developer.chrome.com/multidevice/android/customtabs#whatarethey">Chrome Custom Tabs</a> for Android & <a href="https://developer.apple.com/documentation/safariservices">SafariServices</a>/<a href="https://developer.apple.com/documentation/authenticationservices">AuthenticationServices</a> for iOS.</h4>
 
 <p align="center">
   <img width="400px" src="img/inappbrowser.png">
@@ -42,7 +41,7 @@ Methods       | Action
 ------------- | ------
 `open`        | Opens the url with Safari in a modal on iOS using **SFSafariViewController**, and Chrome in a new custom tab on Android. On iOS, the modal Safari will not share cookies with the system Safari.
 `close`       | Dismisses the system's presented web browser
-`openAuth`    | Opens the url with Safari in a modal on iOS using **SFAuthenticationSession**, and Chrome in a new custom tab on Android. On iOS, the user will be asked whether to allow the app to authenticate using the given url.
+`openAuth`    | Opens the url with Safari in a modal on iOS using **SFAuthenticationSession/ASWebAuthenticationSession**, and Chrome in a new custom tab on Android. On iOS, the user will be asked whether to allow the app to authenticate using the given url.
 `closeAuth`   | Dismisses the current authentication session
 `isAvailable` | Detect if the device supports this plugin
 

demo/app/tests/tests.js

@@ -1,25 +1,43 @@
+var application = require('tns-core-modules/application')
+var utils = require('tns-core-modules/utils/utils')
 var InAppBrowser = require('nativescript-inappbrowser').default
 
-describe("open function", function () {
-  it("exist", function () {
+describe("isAvailable", function () {
+  it("exists", function () {
+    expect(InAppBrowser.isAvailable).toBeDefined()
+  })
+
+  it("supported", async function () {
+    if (application.android ||
+      (application.ios && utils.ios.MajorVersion >= 9)) {
+      expect(await InAppBrowser.isAvailable()).toBeTruthy()
+    }
+    else {
+      expect(await InAppBrowser.isAvailable()).toBeFalsy()
+    }
+  })
+})
+
+describe("open", function () {
+  it("exists", function () {
     expect(InAppBrowser.open).toBeDefined()
   })
 })
 
-describe("close function", function () {
-  it("exist", function () {
+describe("close", function () {
+  it("exists", function () {
     expect(InAppBrowser.close).toBeDefined()
   })
 })
 
-describe("openAuth function", function () {
-  it("exist", function () {
+describe("openAuth", function () {
+  it("exists", function () {
     expect(InAppBrowser.openAuth).toBeDefined()
   })
 })
 
-describe("closeAuth function", function () {
-  it("exist", function () {
+describe("closeAuth", function () {
+  it("exists", function () {
     expect(InAppBrowser.closeAuth).toBeDefined()
   })
 })

src/InAppBrowser.ios.ts

@@ -17,7 +17,7 @@ type InAppBrowserOptions = {
 const InAppBrowser = (<any>NSObject).extend({
   redirectResolve: null,
   redirectReject: null,
-  authSession: <SFAuthenticationSession> null,
+  authSession: <SFAuthenticationSession | ASWebAuthenticationSession> null,
   isAvailable(): Promise<boolean> {
     return Promise.resolve(ios.MajorVersion >= 9);
   },
@@ -83,7 +83,7 @@ const InAppBrowser = (<any>NSObject).extend({
         if (!self.initializeWebBrowser(resolve, reject)) return;
 
         const url = NSURL.URLWithString(authUrl);
-        const authSession = SFAuthenticationSession.alloc().initWithURLCallbackURLSchemeCompletionHandler(
+        self.authSession = (ios.MajorVersion >= 12 ? ASWebAuthenticationSession : SFAuthenticationSession).alloc().initWithURLCallbackURLSchemeCompletionHandler(
           url,
           redirectUrl,
           function (callbackURL, error) {
@@ -101,8 +101,7 @@ const InAppBrowser = (<any>NSObject).extend({
             self.flowDidFinish();
           }
         );
-        authSession.start();
-        self.authSession = authSession;
+        self.authSession.start();
       });
     }
     else {
@@ -116,7 +115,7 @@ const InAppBrowser = (<any>NSObject).extend({
   },
   closeAuth() {
     if (ios.MajorVersion >= 11) {
-      const authSession: SFAuthenticationSession = this.authSession;
+      const authSession: SFAuthenticationSession | ASWebAuthenticationSession = this.authSession;
       authSession.cancel();
       if (this.redirectResolve) {
         this.redirectResolve({
@@ -129,9 +128,6 @@ const InAppBrowser = (<any>NSObject).extend({
       this.close();
     }
   },
-  safariViewControllerDidCompleteInitialLoad(controller: SFSafariViewController, didLoadSuccessfully: boolean): void {
-    console.log('Delegate, safariViewControllerDidCompleteInitialLoad: ' + didLoadSuccessfully);
-  },
   safariViewControllerDidFinish(controller: SFSafariViewController): void {
     if (this.redirectResolve) {
       this.redirectResolve({

src/package-lock.json

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