Merge pull request #647 from dekundu/master

Added popup related error handling for implicit grant

Author: manfredsteyer

projects/lib/src/events.ts

@@ -20,7 +20,9 @@ export type EventType =
   | 'session_changed'
   | 'session_error'
   | 'session_terminated'
-  | 'logout';
+  | 'logout'
+  | 'popup_closed'
+  | 'popup_blocked';
 
 export abstract class OAuthEvent {
   constructor(readonly type: EventType) {}

projects/lib/src/oauth-service.ts

@@ -927,27 +927,49 @@ export class OAuthService extends AuthConfig implements OnDestroy {
             display: 'popup'
         }).then(url => {
             return new Promise((resolve, reject) => {
+              /**
+               * Error handling section
+               */
+                const checkForPopupClosedInterval = 500;
                 let windowRef = window.open(url, '_blank', this.calculatePopupFeatures(options));
+                let checkForPopupClosedTimer: any;
+                const checkForPopupClosed = () => {
+                  if (!windowRef || windowRef.closed) {
+                    cleanup();
+                    reject(new OAuthErrorEvent('popup_closed', {}));
+                  }
+                };
+                if (!windowRef) {
+                  reject(new OAuthErrorEvent('popup_blocked', {}));
+                } else {
+                  checkForPopupClosedTimer = window.setInterval(checkForPopupClosed, checkForPopupClosedInterval);
+                }
 
                 const cleanup = () => {
+                    window.clearInterval(checkForPopupClosedTimer);
                     window.removeEventListener('message', listener);
-                    windowRef.close();
+                    if (windowRef !== null) {
+                      windowRef.close();
+                    }
                     windowRef = null;
                 };
 
                 const listener = (e: MessageEvent) => {
                     const message = this.processMessageEventMessage(e);
-
-                    this.tryLogin({
-                        customHashFragment: message,
-                        preventClearHashAfterLogin: true,
-                    }).then(() => {
-                        cleanup();
-                        resolve();
-                    }, err => {
-                        cleanup();
-                        reject(err);
-                    });
+                    if (message && message !== null) {
+                      this.tryLogin({
+                          customHashFragment: message,
+                          preventClearHashAfterLogin: true,
+                      }).then(() => {
+                          cleanup();
+                          resolve();
+                      }, err => {
+                          cleanup();
+                          reject(err);
+                      });
+                    } else {
+                      console.log('false event firing');
+                    }
                 };
 
                 window.addEventListener('message', listener);