Merge pull request #1146 from kwojtasinski-repo/1134_automatic_close_…

…window_after_some_time

 #1134  Add possibility to automatically close popup window after som…

docs/oidc-client-ts.api.md

@@ -480,6 +480,7 @@ export interface OidcStandardClaims {
 export interface PopupWindowFeatures {
     // (undocumented)
     [k: string]: boolean | string | number | undefined;
+    closePopupWindowAfterInSeconds?: number;
     // (undocumented)
     height?: number;
     // (undocumented)

src/UserManagerSettings.test.ts

@@ -53,6 +53,19 @@ describe("UserManagerSettings", () => {
             expect(subject.popupWindowFeatures).toEqual({ status: true });
         });
 
+        it("should set closePopupWindowAfterInMilliseconds", () => {
+            // act
+            const closePopupWindowAfterInSeconds = 100;
+            const subject = new UserManagerSettingsStore({
+                authority: "authority",
+                client_id: "client",
+                redirect_uri: "redirect",
+                popupWindowFeatures: { status: true, closePopupWindowAfterInSeconds },
+            });
+
+            // assert
+            expect(subject.popupWindowFeatures).toEqual({ status: true, closePopupWindowAfterInSeconds });
+        });
     });
 
     describe("popupWindowTarget", () => {

src/UserManagerSettings.ts

@@ -10,6 +10,7 @@ export const DefaultPopupWindowFeatures: PopupWindowFeatures = {
     location: false,
     toolbar: false,
     height: 640,
+    closePopupWindowAfterInSeconds: -1,
 };
 export const DefaultPopupTarget = "_blank";
 const DefaultAccessTokenExpiringNotificationTimeInSeconds = 60;
@@ -28,7 +29,7 @@ export interface UserManagerSettings extends OidcClientSettings {
     /**
      * The features parameter to window.open for the popup signin window. By default, the popup is
      * placed centered in front of the window opener.
-     * (default: \{ location: false, menubar: false, height: 640 \})
+     * (default: \{ location: false, menubar: false, height: 640, closePopupWindowAfterInSeconds: -1 \})
      */
     popupWindowFeatures?: PopupWindowFeatures;
     /** The target parameter to window.open for the popup signin window (default: "_blank") */

src/navigators/PopupWindow.test.ts

@@ -144,4 +144,32 @@ describe("PopupWindow", () => {
             keepOpen: false,
         }, window.location.origin);
     });
+
+    it("should close the window after closePopupWindowAfter is greater than 0", async () => {
+        const popupWindow = new PopupWindow({ popupWindowFeatures: { closePopupWindowAfterInSeconds: 1 } });
+
+        const promise = popupWindow.navigate({ url: "http://sts/authorize?x=y", state: "someid" });
+
+        jest.runOnlyPendingTimers();
+        await expect(promise).rejects.toThrow("Popup blocked by user");
+        jest.runAllTimers();
+    });
+
+    it("shouldnt close the window after closePopupWindowAfter is equal to 0", async () => {
+        jest.spyOn(global, "setTimeout");
+
+        new PopupWindow({ popupWindowFeatures: { closePopupWindowAfterInSeconds: 0 } });
+
+        jest.runOnlyPendingTimers();
+        expect(setTimeout).toHaveBeenCalledTimes(0);
+    });
+
+    it("shouldnt close the window after closePopupWindowAfter is less than 0", async () => {
+        jest.spyOn(global, "setTimeout");
+
+        new PopupWindow({ popupWindowFeatures: { closePopupWindowAfterInSeconds: -120 } });
+
+        jest.runOnlyPendingTimers();
+        expect(setTimeout).toHaveBeenCalledTimes(0);
+    });
 });

src/navigators/PopupWindow.ts

@@ -7,6 +7,7 @@ import { AbstractChildWindow } from "./AbstractChildWindow";
 import type { NavigateParams, NavigateResponse } from "./IWindow";
 
 const checkForPopupClosedInterval = 500;
+const second = 1000;
 
 /**
  * @public
@@ -31,6 +32,13 @@ export class PopupWindow extends AbstractChildWindow {
         super();
         const centeredPopup = PopupUtils.center({ ...DefaultPopupWindowFeatures, ...popupWindowFeatures });
         this._window = window.open(undefined, popupWindowTarget, PopupUtils.serialize(centeredPopup));
+        if (popupWindowFeatures.closePopupWindowAfterInSeconds && popupWindowFeatures.closePopupWindowAfterInSeconds > 0) {
+            setTimeout(() => { 
+                if (!this._window || typeof this._window.closed !== "boolean" || this._window.closed) {
+                    this._abort.raise(new Error("Popup blocked by user"));
+                }
+            }, popupWindowFeatures.closePopupWindowAfterInSeconds * second);
+        }
     }
 
     public async navigate(params: NavigateParams): Promise<NavigateResponse> {

src/utils/PopupUtils.ts

@@ -14,6 +14,8 @@ export interface PopupWindowFeatures {
     status?: boolean | string;
     resizable?: boolean | string;
     scrollbars?: boolean | string;
+    /** Close popup window after time in seconds, by default it is -1. To enable this feature set value greater than 0 */
+    closePopupWindowAfterInSeconds?: number;
 
     [k: string]: boolean | string | number | undefined;
 }