@saltcorn/server 0.9.6-beta.19 → 0.9.6-beta.20

package/auth/routes.js

@@ -1103,15 +1103,20 @@ router.post(
       res.redirect("/auth/twofa/login/totp");
       return;
     }
+    let maxAge = null;
     if (req.session.cookie)
       if (req.body.remember) {
-        const setDur = +getState().getConfig("cookie_duration_remember", 0);
-        if (setDur) req.session.cookie.maxAge = setDur * 60 * 60 * 1000;
-        else req.session.cookie.expires = false;
+        const setDur = +getState().getConfig("cookie_duration_remember", 720);
+        if (setDur) {
+          maxAge = setDur * 60 * 60 * 1000;
+          req.session.cookie.maxAge = maxAge;
+        } else req.session.cookie.expires = false;
       } else {
-        const setDur = +getState().getConfig("cookie_duration", 0);
-        if (setDur) req.session.cookie.maxAge = setDur * 60 * 60 * 1000;
-        else req.session.cookie.expires = false;
+        const setDur = +getState().getConfig("cookie_duration", 720);
+        if (setDur) {
+          maxAge = setDur * 60 * 60 * 1000;
+          req.session.cookie.maxAge = maxAge;
+        } else req.session.cookie.expires = false;
       }
     const session_id = getSessionId(req);
 
@@ -1119,7 +1124,7 @@ router.post(
       session_id,
       old_session_id: req.old_session_id,
     });
-    res?.cookie?.("loggedin", "true");
+    res?.cookie?.("loggedin", "true", maxAge ? { maxAge } : undefined);
     req.flash("success", req.__("Welcome, %s!", req.user.email));
     if (req.smr) {
       const dbUser = await User.findOne({ id: req.user.id });

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.9.6-beta.19",
+  "version": "0.9.6-beta.20",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
     "@aws-sdk/client-s3": "^3.451.0",
-    "@saltcorn/base-plugin": "0.9.6-beta.19",
-    "@saltcorn/builder": "0.9.6-beta.19",
-    "@saltcorn/data": "0.9.6-beta.19",
-    "@saltcorn/admin-models": "0.9.6-beta.19",
-    "@saltcorn/filemanager": "0.9.6-beta.19",
-    "@saltcorn/markup": "0.9.6-beta.19",
-    "@saltcorn/plugins-loader": "0.9.6-beta.19",
-    "@saltcorn/sbadmin2": "0.9.6-beta.19",
+    "@saltcorn/base-plugin": "0.9.6-beta.20",
+    "@saltcorn/builder": "0.9.6-beta.20",
+    "@saltcorn/data": "0.9.6-beta.20",
+    "@saltcorn/admin-models": "0.9.6-beta.20",
+    "@saltcorn/filemanager": "0.9.6-beta.20",
+    "@saltcorn/markup": "0.9.6-beta.20",
+    "@saltcorn/plugins-loader": "0.9.6-beta.20",
+    "@saltcorn/sbadmin2": "0.9.6-beta.20",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",

package/public/saltcorn-common.js

@@ -655,6 +655,138 @@ function escapeHtml(text) {
 function reload_on_init() {
   localStorage.setItem("reload_on_init", true);
 }
+
+function doMobileTransforms() {
+  const replaceAttr = (el, attr, web, mobile) => {
+    const jThis = $(el);
+    const skip = jThis.attr("skip-mobile-adjust");
+    if (!skip) {
+      const attrVal = jThis.attr(attr);
+      if (attrVal?.includes(web)) {
+        jThis.attr(attr, attrVal.replace(web, mobile));
+      }
+    }
+  };
+
+  const replacers = {
+    href: [
+      {
+        web: "javascript:history.back()",
+        mobile: "javascript:parent.goBack()",
+      },
+      {
+        web: "javascript:ajax_modal",
+        mobile: "javascript:mobile_modal",
+      },
+    ],
+    onclick: [
+      {
+        web: "history.back()",
+        mobile: "parent.goBack()",
+      },
+      {
+        web: "ajax_modal",
+        mobile: "mobile_modal",
+      },
+      {
+        web: "ajax_post_",
+        mobile: "local_post_",
+      },
+    ],
+  };
+
+  $("a").each(function () {
+    let path = $(this).attr("href") || "";
+    if (path.startsWith("http")) {
+      const url = new URL(path);
+      path = `${url.pathname}${url.search}`;
+    }
+    if (path.startsWith("/view/") || path.startsWith("/page/")) {
+      const jThis = $(this);
+      const skip = jThis.attr("skip-mobile-adjust");
+      if (!skip) {
+        jThis.removeAttr("href");
+        jThis.attr("onclick", `execLink('${path}')`);
+        if (jThis.find("i,img").length === 0 && !jThis.css("color")) {
+          jThis.css(
+            "color",
+            "rgba(var(--bs-link-color-rgb),var(--bs-link-opacity,1))"
+          );
+        }
+      }
+    } else if (path.includes("/files/serve/")) {
+      const tokens = path.split("/files/serve/");
+      if (tokens.length > 1)
+        $(this).attr("href", `javascript:openFile('${tokens[1]}')`);
+    } else if (path.includes("/files/download/")) {
+      const tokens = path.split("/files/download/");
+      if (tokens.length > 1)
+        $(this).attr(
+          "href",
+          `javascript:notifyAlert('File donwloads are not supported.')`
+        );
+    } else {
+      for (const [k, v] of Object.entries(replacers)) {
+        for ({ web, mobile } of v) replaceAttr(this, k, web, mobile);
+      }
+    }
+  });
+
+  $("button").each(function () {
+    for (const [k, v] of Object.entries({ onclick: replacers.onclick })) {
+      for ({ web, mobile } of v) replaceAttr(this, k, v.web, v.mobile);
+    }
+  });
+
+  $("[mobile-img-path]").each(async function () {
+    if (parent.loadEncodedFile) {
+      const fileId = $(this).attr("mobile-img-path");
+      const base64Encoded = await parent.loadEncodedFile(fileId);
+      this.src = base64Encoded;
+    }
+  });
+
+  $("[mobile-bg-img-path]").each(async function () {
+    if (parent.loadEncodedFile) {
+      const fileId = $(this).attr("mobile-bg-img-path");
+      if (fileId) {
+        const base64Encoded = await parent.loadEncodedFile(fileId);
+        this.style.backgroundImage = `url("${base64Encoded}")`;
+      }
+    }
+  });
+
+  $("img:not([mobile-img-path]):not([mobile-bg-img-path])").each(
+    async function () {
+      if (parent.loadEncodedFile) {
+        const jThis = $(this);
+        const src = jThis.attr("src");
+        if (src?.includes("/files/serve/")) {
+          const tokens = src.split("/files/serve/");
+          if (tokens.length > 1) {
+            const fileId = tokens[1];
+            const base64Encoded = await parent.loadEncodedFile(fileId);
+            this.src = base64Encoded;
+          }
+        } else if (src?.includes("/files/resize/")) {
+          const tokens = src.split("/files/resize/");
+          if (tokens.length > 1) {
+            const idAndDims = tokens[1].split("/");
+            const width = idAndDims[0];
+            const height = idAndDims.length > 2 ? idAndDims[1] : undefined;
+            const fileId = idAndDims[idAndDims.length - 1];
+            const style = { width: `${width || 50}px` };
+            if (height > 0) style.height = `${height}px`;
+            const base64Encoded = await parent.loadEncodedFile(fileId);
+            this.src = base64Encoded;
+            jThis.css(style);
+          }
+        }
+      }
+    }
+  );
+}
+
 function initialize_page() {
   if (window._sc_locale && window.dayjs) dayjs.locale(window._sc_locale);
   const isNode = getIsNode();
@@ -829,59 +961,7 @@ function initialize_page() {
       </form>`
       );
   });
-  if (!isNode) {
-    $("[mobile-img-path]").each(async function () {
-      if (parent.loadEncodedFile) {
-        const fileId = $(this).attr("mobile-img-path");
-        const base64Encoded = await parent.loadEncodedFile(fileId);
-        this.src = base64Encoded;
-      }
-    });
-
-    $("[mobile-bg-img-path]").each(async function () {
-      if (parent.loadEncodedFile) {
-        const fileId = $(this).attr("mobile-bg-img-path");
-        if (fileId) {
-          const base64Encoded = await parent.loadEncodedFile(fileId);
-          this.style.backgroundImage = `url("${base64Encoded}")`;
-        }
-      }
-    });
-
-    $("a").each(function () {
-      let path = $(this).attr("href") || "";
-      if (path.startsWith("http")) {
-        const url = new URL(path);
-        path = `${url.pathname}${url.search}`;
-      }
-      if (path.startsWith("/view/") || path.startsWith("/page/")) {
-        const jThis = $(this);
-        const skip = jThis.attr("skip-mobile-adjust");
-        if (!skip) {
-          jThis.removeAttr("href");
-          jThis.attr("onclick", `execLink('${path}')`);
-          if (jThis.find("i,img").length === 0 && !jThis.css("color")) {
-            jThis.css(
-              "color",
-              "rgba(var(--bs-link-color-rgb),var(--bs-link-opacity,1))"
-            );
-          }
-        }
-      }
-    });
-
-    $("img").each(async function () {
-      if (parent.loadEncodedFile) {
-        const jThis = $(this);
-        const src = jThis.attr("src");
-        if (src?.startsWith("/files/serve/")) {
-          const fileId = src.replace("/files/serve/", "");
-          const base64Encoded = await parent.loadEncodedFile(fileId);
-          this.src = base64Encoded;
-        }
-      }
-    });
-  }
+  if (!isNode) doMobileTransforms();
   function setExplainer(that) {
     var id = $(that).attr("id") + "_explainer";