Fix auth redirection logic

Author: jdnichollsc

src/ChromeTabsManagerActivity.ts

@@ -1,11 +1,11 @@
 import Context = android.content.Context;
 import Intent = android.content.Intent;
 import Bundle = android.os.Bundle;
+import Log = android.util.Log;
 
 import { Observable } from "@nativescript/core";
 import { BROWSER_TYPES } from "./InAppBrowser.common";
 import { DISMISSED_EVENT } from "./utils.android";
-import { log } from "./utils.common";
 
 class ChromeTabsEvent extends Observable {
   public message: string;
@@ -18,6 +18,7 @@ const BROWSER_ACTIVITY_EVENTS = new ChromeTabsEvent();
 const KEY_BROWSER_INTENT = "browserIntent";
 const BROWSER_RESULT_TYPE = "browserResultType";
 const DEFAULT_RESULT_TYPE = BROWSER_TYPES.DISMISS;
+const TAG = "ChromeTabsManagerActivity";
 
 const notifyMessage = (
   message: string,
@@ -74,7 +75,7 @@ class ChromeTabsManagerActivity extends android.app.Activity {
       this.isError = true;
       notifyMessage("Unable to open url.", this.resultType, this.isError);
       this.finish();
-      log(`InAppBrowser: ${error}`);
+      Log.e(TAG, error.message);
     }
   }
 

src/InAppBrowser.android.ts

@@ -301,19 +301,15 @@ function setup() {
       redirectUrl: string,
       options?: InAppBrowserOptions
     ) {
-      let response = null;
       try {
-        response = await openAuthSessionPolyfillAsync(
-          (startUrl, opt) => this.open(startUrl, opt),
-          url,
-          redirectUrl,
-          options
+        return await openAuthSessionPolyfillAsync(
+          () => this.open(url, options),
+          redirectUrl
         );
       } finally {
         closeAuthSessionPolyfillAsync();
         this.close();
       }
-      return response;
     }
 
     public closeAuth(): void {

src/InAppBrowser.ios.ts

@@ -19,6 +19,7 @@ import {
   setModalInPresentation,
   dismissWithoutAnimation,
   InAppBrowserOpenAuthErrorMessage,
+  getWindow,
 } from "./utils.ios";
 
 const DEFAULT_PROTOCOLS = [
@@ -142,8 +143,8 @@ function setup() {
           }
         }
 
-        const ctrl =
-          UIApplication.sharedApplication.keyWindow.rootViewController;
+        const window = getWindow();
+        const ctrl = window.rootViewController;
         if (modalEnabled) {
           // This is a hack to present the SafariViewController modally
           const safariHackVC =
@@ -198,7 +199,8 @@ function setup() {
       });
     }
     public close() {
-      const ctrl = UIApplication.sharedApplication.keyWindow.rootViewController;
+      const window = getWindow();
+      const ctrl = window.rootViewController;
       ctrl.dismissViewControllerAnimatedCompletion(this.animated, () => {
         if (this.redirectResolve) {
           this.redirectResolve({
@@ -286,7 +288,7 @@ function setup() {
     public presentationAnchorForWebAuthenticationSession(
       _: ASWebAuthenticationSession
     ): UIWindow {
-      return UIApplication.sharedApplication.keyWindow;
+      return getWindow();
     }
     public safariViewControllerDidFinish(
       controller: SFSafariViewController

src/utils.android.ts

@@ -3,7 +3,6 @@ import Intent = android.content.Intent;
 import NfcAdapter = android.nfc.NfcAdapter;
 import Context = android.content.Context;
 import ResolveInfo = android.content.pm.ResolveInfo;
-import Color = android.graphics.Color;
 import List = java.util.List;
 import Arrays = java.util.Arrays;
 
@@ -16,9 +15,8 @@ import {
 } from "@nativescript/core";
 import {
   AuthSessionResult,
+  BrowserResult,
   BROWSER_TYPES,
-  InAppBrowserOptions,
-  OpenBrowserAsync,
   RedirectResult,
 } from "./InAppBrowser.common";
 
@@ -61,6 +59,7 @@ export const DISMISSED_EVENT = "DismissedEvent";
  * Save the handler of the redirection event in order to removes listener later.
  */
 let _redirectHandler: (args: ApplicationEventData) => void;
+
 /**
  * Save the previous url in order to avoid loading the same data for a new Authentication flow.
  */
@@ -109,17 +108,15 @@ function waitForRedirectAsync(returnUrl: string): Promise<RedirectResult> {
 function handleAppStateActiveOnce(): Promise<Activity> {
   return new Promise(function (resolve) {
     // Browser can be closed before handling AppState change
-    if (!Application.android.paused) {
-      const activity =
-        Application.android.foregroundActivity ||
-        Application.android.startActivity;
-      return resolve(activity);
+    if (!Application.android.paused && Application.android.foregroundActivity) {
+      resolve(Application.android.foregroundActivity);
+    }
+    function handleAppStateChange(args: AndroidActivityEventData) {
+      resolve(args.activity);
     }
     Application.android.once(
       AndroidApplication.activityResumedEvent,
-      function (args: AndroidActivityEventData) {
-        resolve(args.activity);
-      }
+      handleAppStateChange,
     );
   });
 }
@@ -143,18 +140,16 @@ async function checkResultAndReturnUrl(
 }
 
 /* Android polyfill for AuthenticationSession flow */
-export function openAuthSessionPolyfillAsync(
-  open: OpenBrowserAsync,
-  startUrl: string,
+export async function openAuthSessionPolyfillAsync(
+  open: () => Promise<BrowserResult>,
   returnUrl: string,
-  options?: InAppBrowserOptions
 ): Promise<AuthSessionResult> {
-  return Promise.race([
-    waitForRedirectAsync(returnUrl),
-    open(startUrl, options).then(function (result) {
+  return await Promise.race([
+    open().then(function (result) {
       return checkResultAndReturnUrl(returnUrl, result);
     }),
-  ]);
+    waitForRedirectAsync(returnUrl),
+  ])
 }
 
 export function closeAuthSessionPolyfillAsync(): void {

src/utils.common.ts

@@ -1,4 +1,4 @@
-import { Color } from "@nativescript/core";
+import { Application, Color } from "@nativescript/core";
 
 export function parseColor(color: string | Color) {
   if (color && !(color instanceof Color)) {
@@ -23,5 +23,8 @@ export function log(message: string, ...optionalParams: any[]): void {
   if (nglog) {
     nglog(message, ...optionalParams);
   }
+  if (Application.android) {
+    android.util.Log.d("JS", message);
+  }
   console.log(message, ...optionalParams);
 }

src/utils.ios.ts

@@ -40,6 +40,14 @@ export function getTransitionStyle(styleKey: string): UIModalTransitionStyle {
     : UIModalTransitionStyle.CoverVertical;
 }
 
+export function getWindow(): UIWindow {
+  const sharedApplication = UIApplication.sharedApplication;
+  if (sharedApplication.windows.count > 0 && sharedApplication.windows[0]) {
+    return sharedApplication.windows[0];
+  }
+  return sharedApplication.keyWindow;
+}
+
 export function dismissWithoutAnimation(
   controller: SFSafariViewController
 ): void {
@@ -54,7 +62,8 @@ export function dismissWithoutAnimation(
   controller.view.alpha = 0.05;
   controller.view.frame = CGRectMake(0.0, 0.0, 0.5, 0.5);
 
-  const ctrl = UIApplication.sharedApplication.keyWindow.rootViewController;
+  const window = getWindow();
+  const ctrl = window.rootViewController;
   ctrl.view.layer.addAnimationForKey(transition, animationKey);
   ctrl.dismissViewControllerAnimatedCompletion(false, () => {
     ctrl.view.layer.removeAnimationForKey(animationKey);