close navigators when error during signin or signout

brockallen · brockallen · commit 4f77c851511d · 2017-09-24T10:41:40.000-04:00
diff --git a/src/CordovaPopupWindow.js b/src/CordovaPopupWindow.js
@@ -85,6 +85,10 @@ export default class CordovaPopupWindow {
         this._reject(new Error(message));
     }
 
+    close() {
+        this._cleanup();
+    }
+
     _cleanup() {
         Log.debug("CordovaPopupWindow._cleanup");
 
diff --git a/src/IFrameWindow.js b/src/IFrameWindow.js
@@ -56,16 +56,22 @@ export default class IFrameWindow {
         this._reject(new Error(message));
     }
 
+    close() {
+        this._cleanup();
+    }
+
     _cleanup() {
-        Log.debug("IFrameWindow._cleanup");
+        if (this._frame) {
+            Log.debug("IFrameWindow._cleanup");
 
-        window.removeEventListener("message", this._boundMessageEvent, false);
-        window.clearTimeout(this._timer);
-        window.document.body.removeChild(this._frame);
+            window.removeEventListener("message", this._boundMessageEvent, false);
+            window.clearTimeout(this._timer);
+            window.document.body.removeChild(this._frame);
 
-        this._timer = null;
-        this._frame = null;
-        this._boundMessageEvent = null;
+            this._timer = null;
+            this._frame = null;
+            this._boundMessageEvent = null;
+        }
     }
 
     _timeout() {
diff --git a/src/PopupWindow.js b/src/PopupWindow.js
@@ -71,6 +71,10 @@ export default class PopupWindow {
         this._reject(new Error(message));
     }
 
+    close() {
+        this._cleanup(false);
+    }
+
     _cleanup(keepOpen) {
         Log.debug("PopupWindow._cleanup");
 
diff --git a/src/UserManager.js b/src/UserManager.js
@@ -318,20 +318,26 @@ export default class UserManager extends OidcClient {
     _signinStart(args, navigator, navigatorParams = {}) {
         Log.debug("_signinStart");
 
+        return navigator.prepare(navigatorParams).then(handle => {
+            Log.debug("got navigator window handle");
 
-        return this.createSigninRequest(args).then(signinRequest => {
-            Log.debug("got signin request");
-
-            navigatorParams.url = signinRequest.url;
-            navigatorParams.id = signinRequest.state.id;
+            return this.createSigninRequest(args).then(signinRequest => {
+                Log.debug("got signin request");
 
-            return navigator.prepare(navigatorParams).then(handle => {
-                Log.debug("got navigator window handle");
+                navigatorParams.url = signinRequest.url;
+                navigatorParams.id = signinRequest.state.id;
                 
                 return handle.navigate(navigatorParams);
+            }).catch(err => {
+                if (handle.close) {
+                    Log.debug("Error after preparing navigator, closing navigator window");
+                    handle.close();
+                }
+                throw err;
             });
         });
     }
+
     _signinEnd(url) {
         Log.debug("_signinEnd");
 
@@ -382,6 +388,12 @@ export default class UserManager extends OidcClient {
                         });
                     });
                 });
+            }).catch(err => {
+                if (handle.close) {
+                    Log.debug("Error after preparing navigator, closing navigator window");
+                    handle.close();
+                }
+                throw err;
             });
         });
     }

Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,10 @@ export default class CordovaPopupWindow {`
`85`	`85`	`this._reject(new Error(message));`
`86`	`86`	`}`
`87`	`87`
	`88`	`+ close() {`
	`89`	`+ this._cleanup();`
	`90`	`+ }`
	`91`	`+`
`88`	`92`	`_cleanup() {`
`89`	`93`	`Log.debug("CordovaPopupWindow._cleanup");`
`90`	`94`
Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,10 @@ export default class PopupWindow {`
`71`	`71`	`this._reject(new Error(message));`
`72`	`72`	`}`
`73`	`73`
	`74`	`+ close() {`
	`75`	`+ this._cleanup(false);`
	`76`	`+ }`
	`77`	`+`
`74`	`78`	`_cleanup(keepOpen) {`
`75`	`79`	`Log.debug("PopupWindow._cleanup");`
`76`	`80`