@olenbetong/appframe-core 2.0.3 → 2.1.0

package/dist/iife/af.common.js

@@ -4,24 +4,19 @@ var af;
   var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
   var __getOwnPropNames = Object.getOwnPropertyNames;
   var __hasOwnProp = Object.prototype.hasOwnProperty;
-  var __defNormalProp = (obj, key2, value) => key2 in obj ? __defProp(obj, key2, { enumerable: true, configurable: true, writable: true, value }) : obj[key2] = value;
   var __export = (target, all) => {
     for (var name in all)
       __defProp(target, name, { get: all[name], enumerable: true });
   };
   var __copyProps = (to, from, except, desc) => {
     if (from && typeof from === "object" || typeof from === "function") {
-      for (let key2 of __getOwnPropNames(from))
-        if (!__hasOwnProp.call(to, key2) && key2 !== except)
-          __defProp(to, key2, { get: () => from[key2], enumerable: !(desc = __getOwnPropDesc(from, key2)) || desc.enumerable });
+      for (let key of __getOwnPropNames(from))
+        if (!__hasOwnProp.call(to, key) && key !== except)
+          __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
     }
     return to;
   };
   var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-  var __publicField = (obj, key2, value) => {
-    __defNormalProp(obj, typeof key2 !== "symbol" ? key2 + "" : key2, value);
-    return value;
-  };
 
   // src/index.ts
   var src_exports = {};
@@ -35,6 +30,7 @@ var af;
     getSettings: () => getSettings,
     has: () => has,
     localStorage: () => localStorage_default,
+    localize: () => localize,
     mitt: () => mitt_default,
     saveSettings: () => saveSettings,
     version: () => version
@@ -81,259 +77,42 @@ var af;
     } };
   }
 
-  // src/has.ts
-  function has(obj, key2) {
-    return Object.prototype.hasOwnProperty.call(obj, key2);
-  }
-
-  // src/getLocalizedString.ts
-  async function getLocalizedStringAsync(text) {
-    try {
-      let response = await fetch(`/api/user/localize/new/${af.article.id}`, {
-        body: JSON.stringify({ text }),
-        headers: {
-          Accept: "application/json; */*",
-          "Content-Type": "application/json",
-          "X-Requested-With": "XMLHttpRequest"
-        },
-        method: "POST"
-      });
-      if (response.ok) {
-        return await response.json();
-      }
-    } catch (error) {
-    }
-    return text;
-  }
-  function afGetLocalizedString(string, wait) {
-    if (typeof string === "string" && string.trim().length === 0) {
-      return string;
-    }
-    if (string === void 0 || string === "" || string === null) {
-      return;
-    }
-    if (af?.article?.i18n !== void 0) {
-      if (!has(af.article.i18n, string)) {
-        af.article.i18n[string] = string;
-        let promise = getLocalizedStringAsync(string).then((text) => {
-          af.article.i18n[string] = text;
-          return text;
-        });
-        if (wait) {
-          return promise;
-        }
-      }
-      return af.article.i18n[string];
-    } else {
-      return string;
-    }
-  }
-  var key = "__UNLOCALIZED_STRINGS__";
-  var localizeSet = window[key] || /* @__PURE__ */ new Set();
-  if (!window[key]) {
-    window[key] = localizeSet;
-  }
-  function handleReadyStateChange() {
-    if (document.readyState !== "loading") {
-      addDeveloperUtils();
-      document.removeEventListener("readystatechange", handleReadyStateChange);
-    }
-  }
-  if (document.readyState !== "loading") {
-    addDeveloperUtils();
-  } else {
-    document.addEventListener("readystatechange", handleReadyStateChange);
-  }
-  function isDeveloper() {
-    const { af: af2 } = window;
-    return af2 && af2.userSession && af2.userSession.isDeveloper;
-  }
-  function addDeveloperUtils() {
-    if (isDeveloper()) {
-      if (typeof window.__doNothingWithStrings === "function") {
-        const addedStrings = window.__doNothingWithStrings();
-        for (let string of Object.keys(addedStrings)) {
-          localizeSet.add(string);
-        }
-      }
-      if (!window[key]) {
-        window[key] = localizeSet;
-      }
-      if (!window.__getUnlocalizedStrings) {
-        window.__getUnlocalizedStrings = function(forCustomRoute) {
-          const strings = [];
-          for (let string of localizeSet) {
-            if (string) {
-              const escaped = string.replace(/'/g, "\\'");
-              if (forCustomRoute) {
-                const localized = afGetLocalizedString(string).replaceAll(/'/g, "\\'");
-                strings.push(`'${escaped}': '${localized}',`);
-              } else {
-                strings.push(
-                  `s['${escaped}'] = @Html(@context.AddLocalizableString("${string.replaceAll('"', '\\"')}"));`
-                );
-              }
-            }
-          }
-          if (forCustomRoute) {
-            return `// Localization hack, since it AddLocalizableString doesn't work properly when custom routes is used
-if (af.userSession.uiculture === 'nb-NO') {
-	const strings = {
-		${strings.join("\n		")}
-	};
-	af.article.i18n = af.article.i18n || {};
-	Object.assign(af.article.i18n, strings);
-}`;
-          }
-          return `<script type="text/javascript">
-function __doNothingWithStrings() {
-@{
-	var context = @Appframe.Web.Context.RequestContext.Current;
-}
-let s = {};
-${strings.join("\n")}
-return s;
-}
-<\/script>`;
-        };
-      }
-    }
-  }
-  function getLocalizedString(string) {
-    const localized = afGetLocalizedString(string);
-    if (localized === string && !localizeSet.has(string)) {
-      localizeSet.add(string);
-    }
-    return localized;
-  }
-
   // src/SessionHandler.ts
-  var _SessionHandler = class {
+  var SessionHandler = class {
     eventHandler = mitt_default();
-    showingDialog = false;
-    dialog = null;
-    expired(callback) {
-      af.userSession = af.userSession || {
-        login: null
-      };
-      if (typeof callback !== "function") {
-        throw new TypeError("Parameter pCallback passed to the expired function must be a function!");
-      }
-      const once = () => {
-        this.detachEvent("onAuthenticated", once);
-        callback();
-      };
-      this.attachEvent("onAuthenticated", once);
-      if (this.showingDialog !== true) {
-        this.showingDialog = true;
-        const contentContainer = document.createElement("div");
-        contentContainer.className = "session-expired-container";
-        contentContainer.innerHTML = `
-<div class="session-expired-log-in" style="margin-top: 20px;">
-  <div class="row">
-    <div class="sessionExpired">
-      <h4 class="message">Frakoblet - tidsavbrudd</h4>
-      <div class="form-group">
-        <label for="username">${getLocalizedString("Username")}</label>
-        <input type="text" class="form-control" id="username" autofocus>
-      </div>
-      <div class="form-group">
-        <label for="password">${getLocalizedString("Password")}</label>
-        <input type="password" autocomplete="password" class="form-control" id="password" >
-      </div>
-      <div class="form-group">
-        <div>
-          <button type="submit" class="btn btn-default sign-in">
-            ${getLocalizedString("Log in")}
-          </button>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div class="row">
-    <div class="" style="display:none; margin: 0px 30px;">
-      <div class="alert alert-warning" role="alert" style="margin-top:10px;"></div> 
-    </div>
-  </div>
-</div>
-`;
-        const message = af.userSession.login ? _SessionHandler.messages.relog : _SessionHandler.messages.login;
-        const messageElem = contentContainer.querySelector(".message");
-        const statusElem = contentContainer.querySelector(".alert-warning");
-        const userElem = contentContainer.querySelector("input[type=text]");
-        const signInElem = contentContainer.querySelector(".sign-in");
-        const passwordElem = contentContainer.querySelector("input[type=password]");
-        if (messageElem !== null && userElem !== null && statusElem !== null && userElem !== null && signInElem !== null && passwordElem !== null) {
-          messageElem.innerText = getLocalizedString(message);
-          userElem.value = af.userSession.login || "";
-          userElem.disabled = !!af.userSession.login;
-          userElem.readOnly = !!af.userSession.login;
-          document.body.appendChild(contentContainer);
-          const doLogin = async () => {
-            passwordElem.disabled = true;
-            const request = new Request("/login", {
-              body: JSON.stringify({
-                username: userElem.value,
-                password: passwordElem.value,
-                remember: false
-              }),
-              headers: {
-                Accept: "application/json",
-                "Content-Type": "application/json; charset=utf-8",
-                "X-Requested-With": "XMLHttpRequest"
-              },
-              method: "POST"
-            });
-            try {
-              const response = await fetch(request);
-              const json = await response.json();
-              if (json.success) {
-                document.body.removeChild(contentContainer);
-                this.showingDialog = false;
-                this.eventHandler.emit("onAuthenticated");
-                if (statusElem.parentNode) {
-                  statusElem.parentNode.style.display = "none";
-                }
-              } else {
-                throw new Error(json.error);
-              }
-            } catch (err) {
-              if (err && typeof err === "object") {
-                let error = err;
-                passwordElem.disabled = false;
-                passwordElem.classList.toggle("invalid", true);
-                passwordElem.value = "";
-                passwordElem.focus();
-                statusElem.innerText = error.message ? error.message : String(error);
-                if (statusElem.parentNode) {
-                  statusElem.parentNode.style.display = "initial";
-                }
-              }
-            }
-          };
-          signInElem.addEventListener("click", doLogin);
-          passwordElem.addEventListener("keyup", (evt) => {
-            if (evt.key === "Enter") {
-              doLogin();
-            }
-          });
-          passwordElem.addEventListener("change", (evt) => {
-            if (evt.key === "Enter") {
-              doLogin();
-            }
-          });
-          userElem.addEventListener("keyup", (evt) => {
-            if (evt.key === "Enter") {
-              doLogin();
-            }
-          });
-          userElem.addEventListener("change", (evt) => {
-            if (evt.key === "Enter") {
-              doLogin();
-            }
-          });
-          passwordElem.focus();
+    authenticated() {
+      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" });
+        } 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 {
+        await authPromise;
       }
     }
     attachEvent(eventName, handler) {
@@ -343,11 +122,6 @@ return s;
       return this.eventHandler.off(eventName, handler);
     }
   };
-  var SessionHandler = _SessionHandler;
-  __publicField(SessionHandler, "messages", {
-    login: "Log in",
-    relog: "Session expired - log in"
-  });
 
   // src/UserSession.ts
   var UserSession = class extends SessionHandler {
@@ -370,7 +144,6 @@ return s;
     shortDateFormat = "dd.MM.yyyy";
     culture = "en-GB";
     uiculture = "en-GB";
-    expired = () => null;
     constructor(userData) {
       super();
       this.formats = {};
@@ -441,7 +214,6 @@ return s;
         });
         response = new Response(stream);
       } catch (error) {
-        console.warn("Failed to replace response stream to log download progress.");
       }
       const blob = await response.blob();
       reportProgress({ bytesReceived, status: "downloaded" });
@@ -456,6 +228,11 @@ return s;
     }
   }
 
+  // src/has.ts
+  function has(obj, key) {
+    return Object.prototype.hasOwnProperty.call(obj, key);
+  }
+
   // src/parseFunc.ts
   var funcRegex = /^function(?:\s+([a-zA-Z$_][a-zA-Z0-9$_]*))?\s*\(((?:(?:\s*[a-zA-Z$_][a-zA-Z0-9$_]*)(?:\s*,\s*[a-zA-Z$_][a-zA-Z0-9$_]*)*)?)\s*\)\s*\{((?:.|\n|\r)*)\}$/;
   function parseFunc(func) {
@@ -484,19 +261,10 @@ return s;
           current = current[namespace[i]] = current[namespace[i]] || new Namespace_default();
         }
         return current;
-      } else {
-        throw new TypeError("Invalid type of parameter 'namespace'");
       }
-    } else {
-      throw new TypeError("Invalid type of parameter 'root'");
     }
   }
 
-  // src/warn.ts
-  function warn(message, fallbackToAlert) {
-    console.warn(message);
-  }
-
   // src/expose.ts
   function expose(name, value) {
     if (arguments.length !== 2) {
@@ -532,37 +300,93 @@ return s;
         throw new TypeError("Invalid typeof parameter 'name', or unable to parse pValue!");
       }
       if (has(namespace, keyName)) {
-        warn([name, keyName].join(".") + " is already defined!");
+        console.warn([name, keyName].join(".") + " is already defined!");
       } else {
         namespace[keyName] = value;
       }
     }
   }
 
+  // src/getLocalizedString.ts
+  async function fetchLocalizedString(text) {
+    try {
+      let response = await fetch(`/api/user/localize/new/${af.article.id}`, {
+        body: JSON.stringify({ text }),
+        headers: {
+          Accept: "application/json; */*",
+          "Content-Type": "application/json",
+          "X-Requested-With": "XMLHttpRequest"
+        },
+        method: "POST"
+      });
+      if (response.ok) {
+        return await response.json();
+      }
+    } catch (error) {
+    }
+    return text;
+  }
+  function getLocalizedString(string, wait) {
+    if (typeof string === "string" && string.trim().length === 0) {
+      return string;
+    }
+    if (string === void 0 || string === "" || string === null) {
+      return;
+    }
+    if (af?.article?.i18n !== void 0) {
+      if (!has(af.article.i18n, string)) {
+        af.article.i18n[string] = string;
+        let promise = fetchLocalizedString(string).then((text) => {
+          af.article.i18n[string] = text;
+          return text;
+        });
+        if (wait) {
+          return promise;
+        }
+      }
+      return af.article.i18n[string];
+    } else {
+      return string;
+    }
+  }
+
+  // src/localize.ts
+  function localize(stringParts, ...args) {
+    if (!Array.isArray(stringParts) || stringParts?.length || stringParts.length !== args.length + 1) {
+      throw TypeError("Method 'localize' must be used as a tag function");
+    }
+    let stringToLocalize = stringParts.map((s, i) => i === stringParts.length - 1 ? s : `${s}$${i}`).join("");
+    let localized = getLocalizedString(stringToLocalize);
+    args.forEach((arg, index) => {
+      localized = localized.replace("$" + index, arg);
+    });
+    return localized;
+  }
+
   // src/localStorage.ts
-  function getLocalKey(key2) {
-    return [af?.article?.id || "", "common", key2].join(".");
+  function getLocalKey(key) {
+    return [af?.article?.id || "", "common", key].join(".");
   }
   var LocalStorage = class {
     isPersisted() {
       return true;
     }
-    getLocalStorageKey(key2, global) {
-      return global ? ["common", key2].join(".") : getLocalKey(key2);
+    getLocalStorageKey(key, global) {
+      return global ? ["common", key].join(".") : getLocalKey(key);
     }
-    get(key2, defaultValue, global) {
-      const lsKey = this.getLocalStorageKey(key2, global);
+    get(key, defaultValue, global) {
+      const lsKey = this.getLocalStorageKey(key, global);
       const value = localStorage.getItem(lsKey);
       return value !== null ? JSON.parse(value) : defaultValue;
     }
-    set(key2, value, global) {
+    set(key, value, global) {
       localStorage.setItem(
-        this.getLocalStorageKey(key2, global),
+        this.getLocalStorageKey(key, global),
         JSON.stringify(value)
       );
     }
-    remove(key2, global) {
-      const lsKey = this.getLocalStorageKey(key2, global);
+    remove(key, global) {
+      const lsKey = this.getLocalStorageKey(key, global);
       if (localStorage.getItem(lsKey) !== null) {
         localStorage.removeItem(lsKey);
         return true;
@@ -572,9 +396,9 @@ return s;
     }
     clear() {
       const baseKey = getLocalKey("");
-      for (let key2 in localStorage) {
-        if (key2.slice(0, baseKey.length) === baseKey) {
-          localStorage.removeItem(key2);
+      for (let key in localStorage) {
+        if (key.slice(0, baseKey.length) === baseKey) {
+          localStorage.removeItem(key);
         }
       }
     }
@@ -589,8 +413,8 @@ return s;
   function getSettings(setting, article) {
     if (!af?.userSession)
       return null;
-    const key2 = getKey(article);
-    const settings = JSON.parse(localStorage.getItem(key2) || "{}");
+    const key = getKey(article);
+    const settings = JSON.parse(localStorage.getItem(key) || "{}");
     if (setting) {
       return settings[setting] || null;
     }
@@ -599,17 +423,17 @@ return s;
   function saveSettings(setting, value, article) {
     if (!af?.userSession)
       return;
-    const key2 = getKey(article);
-    let userSettings = JSON.parse(localStorage.getItem(key2) || "{}");
+    const key = getKey(article);
+    let userSettings = JSON.parse(localStorage.getItem(key) || "{}");
     if (typeof value !== "undefined") {
       userSettings[setting] = value;
     } else {
       userSettings = setting;
     }
-    localStorage.setItem(key2, JSON.stringify(userSettings));
+    localStorage.setItem(key, JSON.stringify(userSettings));
   }
 
   // src/index.ts
-  var version = "2.0.3";
+  var version = "2.1.0";
   return __toCommonJS(src_exports);
 })();