@olenbetong/appframe-core 2.1.1 → 2.1.2

package/es/SessionHandler.d.ts

@@ -3,7 +3,7 @@ declare type SessionHandlerEvent = "onExpired" | "onAuthenticated";
 export default class SessionHandler {
     private eventHandler;
     authenticated(): void;
-    expired(callback?: (() => void), type?: "RequireTwoFactor"): Promise<void>;
+    expired(callback?: () => void, type?: "RequireTwoFactor"): Promise<void>;
     attachEvent(eventName: SessionHandlerEvent, handler: Handler): void;
     detachEvent(eventName: SessionHandlerEvent, handler: Handler): void;
 }

package/es/SessionHandler.js

@@ -7,37 +7,42 @@ export default class SessionHandler {
         this.eventHandler.emit("onAuthenticated");
     }
     async expired(callback, type) {
-        let authPromise = new Promise((resolve) => {
-            let eventHandler = () => {
-                this.eventHandler.off("onAuthenticated", eventHandler);
-                callback?.();
-                resolve();
-            };
-            this.eventHandler.on("onAuthenticated", eventHandler);
-        });
-        let dialog = document.querySelector("dialog.session-expired-dialog");
-        if (!dialog) {
-            dialog = document.createElement("dialog");
-            dialog.className = "session-expired-dialog";
-            dialog.style.display = "flex";
-            dialog.style.padding = "0";
-            dialog.style.left = "50%";
-            dialog.style.transform = "translateX(-50%)";
-            let link = "/login?ReturnUrl=%2fapi/sessionexpired/remove";
-            if (type !== "RequireTwoFactor") {
-                await fetch("/logout", { method: "POST" });
+        try {
+            let authPromise = new Promise((resolve) => {
+                let eventHandler = () => {
+                    this.eventHandler.off("onAuthenticated", eventHandler);
+                    callback?.();
+                    resolve();
+                };
+                this.eventHandler.on("onAuthenticated", eventHandler);
+            });
+            let dialog = document.querySelector("dialog.session-expired-dialog");
+            if (!dialog) {
+                dialog = document.createElement("dialog");
+                dialog.className = "session-expired-dialog";
+                dialog.style.display = "flex";
+                dialog.style.padding = "0";
+                dialog.style.left = "50%";
+                dialog.style.transform = "translateX(-50%)";
+                let link = "/login?ReturnUrl=%2fapi/sessionexpired/remove";
+                if (type !== "RequireTwoFactor") {
+                    await fetch("/logout", { method: "POST" });
+                }
+                else {
+                    link = "/login?RequireTwoFactor=1&ReturnUrl=%2fapi/sessionexpired/remove";
+                }
+                dialog.innerHTML = `<iframe sandbox="allow-same-origin allow-scripts allow-modals allow-top-navigation-by-user-activation allow-forms" src="${link}" style="border:0;width:min(500px,100vw);height:min(700px, 100vh);"></iframe>`;
+                document.body.append(dialog);
+                dialog.showModal();
+                await authPromise;
+                dialog.remove();
             }
             else {
-                link = "/login?RequireTwoFactor=1&ReturnUrl=%2fapi/sessionexpired/remove";
+                await authPromise;
             }
-            dialog.innerHTML = `<iframe sandbox="allow-same-origin allow-scripts allow-modals allow-top-navigation-by-user-activation allow-forms" src="${link}" style="border:0;width:min(500px,100vw);height:min(700px, 100vh);"></iframe>`;
-            document.body.append(dialog);
-            dialog.showModal();
-            await authPromise;
-            dialog.remove();
         }
-        else {
-            await authPromise;
+        catch (_) {
+            window.location.href = `/login?ReturnUrl=${encodeURIComponent(window.location.pathname)}${encodeURIComponent(window.location.search)}`;
         }
     }
     attachEvent(eventName, handler) {

package/es/index.js

@@ -11,4 +11,4 @@ export { default as localStorage } from "./localStorage.js";
 export { default as SessionHandler } from "./SessionHandler.js";
 export { UserSession };
 export * from "./settings.js";
-export const version = "2.1.1";
+export const version = "2.1.2";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@olenbetong/appframe-core",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "Javascript libraries to utilize the Appframe framework",
   "type": "module",
   "sideEffects": [
@@ -48,5 +48,5 @@
   "devDependencies": {
     "chalk": "^5.0.1"
   },
-  "gitHead": "88ae66ed8f3352d23be5c568fc2eedede1ce56de"
+  "gitHead": "16ac538bb4913c802543c23671e4169fa7c7607b"
 }

package/src/SessionHandler.ts

@@ -9,14 +9,15 @@ export default class SessionHandler {
     this.eventHandler.emit("onAuthenticated");
   }
 
-  async expired(callback?: (() => void), type?: "RequireTwoFactor"): Promise<void> {
+  async expired(callback?: () => void, type?: "RequireTwoFactor"): Promise<void> {
+    try {
       let authPromise = new Promise<void>((resolve) => {
         let eventHandler = () => {
           this.eventHandler.off("onAuthenticated", eventHandler);
           callback?.();
           resolve();
-        }
-  
+        };
+
         this.eventHandler.on("onAuthenticated", eventHandler);
       });
 
@@ -28,7 +29,7 @@ export default class SessionHandler {
         dialog.style.padding = "0";
         dialog.style.left = "50%";
         dialog.style.transform = "translateX(-50%)";
-        
+
         let link = "/login?ReturnUrl=%2fapi/sessionexpired/remove";
         if (type !== "RequireTwoFactor") {
           await fetch("/logout", { method: "POST" });
@@ -44,7 +45,11 @@ export default class SessionHandler {
       } else {
         await authPromise;
       }
-
+    } catch (_) {
+      window.location.href = `/login?ReturnUrl=${encodeURIComponent(window.location.pathname)}${encodeURIComponent(
+        window.location.search
+      )}`;
+    }
   }
 
   attachEvent(eventName: SessionHandlerEvent, handler: Handler) {