@saltcorn/server 1.3.0-beta.13 → 1.3.0-beta.15

package/public/saltcorn.js

@@ -158,14 +158,16 @@ function invalidate_pagings(href) {
 
 function set_state_fields(kvs, disable_pjax, e) {
   let newhref = get_current_state_url(e);
+  const oldhref = newhref;
   if (Object.keys(kvs).some((k) => !is_paging_param(k))) {
     newhref = invalidate_pagings(newhref);
   }
   Object.entries(kvs).forEach((kv) => {
-    if (kv[1].unset && kv[1].unset === true)
+    if (kv[1]?.unset && kv[1]?.unset === true)
       newhref = removeQueryStringParameter(newhref, kv[0]);
     else newhref = updateQueryStringParameter(newhref, kv[0], kv[1]);
   });
+  if (newhref === oldhref) return;
   if (disable_pjax) href_to(newhref.replace("&&", "&").replace("?&", "?"));
   else pjax_to(newhref.replace("&&", "&").replace("?&", "?"), e);
 }
@@ -1241,6 +1243,15 @@ window.addEventListener("beforeinstallprompt", (e) => {
   defferedPrompt = e;
 });
 
+window.addEventListener("appinstalled", async (event) => {
+  console.log("App was installed.", event);
+  await initPushNotify();
+});
+
+document.addEventListener("DOMContentLoaded", async () => {
+  await initPushNotify();
+});
+
 function isAndroidMobile() {
   const ua = navigator.userAgent || navigator.vendor || window.opera;
   return /android/i.test(ua) && /mobile/i.test(ua);
@@ -1439,14 +1450,14 @@ function cfu_translate(that) {
         l = function (a, b) {
           d = setTimeout(function () {
             d = !1;
-            if (h || c) e.apply(a, b), c && (j = +new Date());
+            if (h || c) (e.apply(a, b), c && (j = +new Date()));
             i && g.apply(a, b);
           }, f);
         },
         k = function () {
           if (!d || a) {
             if (!d && !h && (!c || +new Date() - j > f))
-              e.apply(this, arguments), c && (j = +new Date());
+              (e.apply(this, arguments), c && (j = +new Date()));
             (a || !c) && clearTimeout(d);
             l(this, arguments);
           }

package/public/serviceworker.js

@@ -3,3 +3,14 @@
 self.addEventListener("fetch", function () {
   return;
 });
+
+self.addEventListener("push", function (event) {
+  const data = event.data.json();
+  event.waitUntil(
+    self.registration.showNotification(data.title, {
+      body: data.body,
+      icon: data.icon,
+      badge: data.badge,
+    })
+  );
+});

package/routes/actions.js

@@ -1234,23 +1234,26 @@ router.get(
         { orderBy: "RANDOM()", forUser: req.user, forPublic: !req.user }
       );
     }
-    let runres;
 
-    try {
-      runres = await trigger.runWithoutRow({
-        console: fakeConsole,
-        table,
-        row,
-        req,
-        interactive: true,
-        ...(row || {}),
-        Table,
-        user: req.user,
-      });
-    } catch (e) {
-      console.error(e);
-      fakeConsole.error(e.message);
-    }
+    const runres = await db.withTransaction(
+      async () => {
+        return await trigger.runWithoutRow({
+          console: fakeConsole,
+          table,
+          row,
+          req,
+          interactive: true,
+          ...(row || {}),
+          Table,
+          user: req.user,
+        });
+      },
+      (e) => {
+        console.error(e);
+        fakeConsole.error(e.message);
+      }
+    );
+
     if (output.length === 0) {
       req.flash(
         "success",

package/routes/admin.js

@@ -4501,6 +4501,28 @@ admin_config_route({
       name: "pwa_icons",
       showIf: { pwa_enabled: true },
     },
+    { section_header: "Push Notifications" },
+    "enable_push_notify",
+    {
+      name: "vapid_public_key",
+      showIf: { enable_push_notify: true },
+    },
+    {
+      name: "vapid_private_key",
+      showIf: { enable_push_notify: true },
+    },
+    {
+      name: "vapid_email",
+      showIf: { enable_push_notify: true },
+    },
+    {
+      name: "push_notification_icon",
+      showIf: { enable_push_notify: true },
+    },
+    {
+      name: "push_notification_badge",
+      showIf: { enable_push_notify: true },
+    },
   ],
   response(form, req, res) {
     send_admin_page({
@@ -4511,7 +4533,40 @@ admin_config_route({
         type: "card",
         title: req.__("Notification settings"),
         titleAjaxIndicator: true,
-        contents: [renderForm(form, req.csrfToken())],
+        contents: [
+          renderForm(form, req.csrfToken()) +
+            button(
+              {
+                id: "generate-vapid-keys-btn",
+                class: "btn btn-primary d-none",
+                onclick:
+                  "if (confirm('Are you sure? The old keys will be lost, and existing subscriptions will be deleted.')) ajax_post_btn('/notifications/generate-vapid-keys', true)",
+              },
+              "Generate VAPID keys"
+            ) +
+            script(
+              domReady(`
+  const fn = () => {
+    const pushEnabled = document.getElementById("inputenable_push_notify");
+    const generateBtn = document.getElementById("generate-vapid-keys-btn");
+    if (pushEnabled && pushEnabled.checked) {
+      generateBtn.classList.remove("d-none");
+      generateBtn.classList.add("d-inline");
+    }
+    else {
+      generateBtn.classList.remove("d-inline");
+      generateBtn.classList.add("d-none");
+    }
+  };
+  setTimeout(fn, 0);
+  const mainForm = document.querySelector("form[action='/admin/notifications']");
+  if (mainForm) {
+    mainForm.addEventListener("change", (e) => {
+      fn();
+    });
+  }`)
+            ),
+        ],
       },
     });
   },

package/routes/notifications.js

@@ -32,14 +32,23 @@ router.use(
   })
 );
 
-const notificationSettingsForm = () =>
-  new Form({
+const notificationSettingsForm = () => {
+  const fields = [{ name: "notify_email", label: "Email", type: "Bool" }];
+  if (getState().getConfig("enable_push_notify", false))
+    fields.push({
+      name: "notify_push",
+      label: "Push",
+      type: "Bool",
+    });
+
+  return new Form({
     action: `/notifications/settings`,
     noSubmitButton: true,
     onChange: `saveAndContinue(this)`,
     labelCols: 4,
-    fields: [{ name: "notify_email", label: "Email", type: "Bool" }],
+    fields,
   });
+};
 
 router.get(
   "/",
@@ -67,7 +76,10 @@ router.get(
 
     const form = notificationSettingsForm();
     const user = await User.findOne({ id: req.user?.id });
-    form.values = { notify_email: user?._attributes?.notify_email };
+    form.values = {
+      notify_email: user?._attributes?.notify_email,
+      notify_push: user?._attributes?.notify_push,
+    };
     const notifyCards = nots.length
       ? nots.map((not) => ({
           type: "card",
@@ -185,6 +197,16 @@ router.post(
     form.validate(req.body || {});
     const _attributes = { ...user._attributes, ...form.values };
     await user.update({ _attributes });
+    const pushEnabled = !!_attributes.notify_push;
+    const allSubs = getState().getConfig("push_notification_subscriptions", {});
+    const newSubs = { ...allSubs };
+    if (!pushEnabled && newSubs[req.user.id]) {
+      delete newSubs[req.user.id];
+      await getState().setConfig("push_notification_subscriptions", newSubs);
+    } else if (pushEnabled && !newSubs[req.user.id]) {
+      newSubs[req.user.id] = [];
+      await getState().setConfig("push_notification_subscriptions", newSubs);
+    }
     res.json({ success: "ok" });
   })
 );
@@ -248,6 +270,121 @@ router.post(
   })
 );
 
+router.post(
+  "/subscribe",
+  loggedIn,
+  error_catcher(async (req, res) => {
+    const enabled = getState().getConfig("enable_push_notify", false);
+    if (!enabled) {
+      res.status(403).json({
+        error: req.__("Notifications are not enabled on this server"),
+      });
+    } else {
+      const user = req.user;
+      const allSubs = getState().getConfig(
+        "push_notification_subscriptions",
+        {}
+      );
+      const userSubs = allSubs[user.id] || [];
+      const existingSub = userSubs.find(
+        (s) =>
+          s.endpoint === req.body.endpoint &&
+          s.keys.p256dh === req.body.keys.p256dh &&
+          s.keys.auth === req.body.keys.auth
+      );
+      if (existingSub) {
+        res.json({
+          success: "ok",
+          message: req.__("Subscribed to notifications"),
+        });
+      } else {
+        userSubs.push({
+          endpoint: req.body.endpoint,
+          keys: {
+            auth: req.body.keys.auth,
+            p256dh: req.body.keys.p256dh,
+          },
+        });
+        await getState().setConfig("push_notification_subscriptions", {
+          ...allSubs,
+          [user.id]: userSubs,
+        });
+        res.json({
+          success: "ok",
+          message: req.__("Subscribed to notifications"),
+        });
+      }
+    }
+  })
+);
+
+router.post(
+  "/remove-subscription",
+  loggedIn,
+  error_catcher(async (req, res) => {
+    const enabled = getState().getConfig("enable_push_notify", false);
+    if (!enabled) {
+      res.status(403).json({
+        error: req.__("Notifications are not enabled on this server"),
+      });
+    } else {
+      const { subscription } = req.body;
+      const user = req.user;
+      const oldSubs = getState().getConfig(
+        "push_notification_subscriptions",
+        {}
+      );
+      let userSubs = oldSubs[user.id];
+      if (userSubs) {
+        userSubs = userSubs.filter(
+          (s) =>
+            s.endpoint !== subscription.endpoint ||
+            s.keys.p256dh !== subscription.keys.p256dh ||
+            s.keys.auth !== subscription.keys.auth
+        );
+        await getState().setConfig("push_notification_subscriptions", {
+          ...oldSubs,
+          [user.id]: userSubs,
+        });
+      }
+      res.json({
+        success: "ok",
+        message: req.__("Unsubscribed from notifications"),
+      });
+    }
+  })
+);
+
+router.post(
+  "/generate-vapid-keys",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const enabled = getState().getConfig("enable_push_notify", false);
+    if (!enabled) {
+      res.status(403).json({
+        error: req.__("Notifications are not enabled on this server"),
+      });
+    } else {
+      const webPush = require("web-push");
+      const vapidKeys = webPush.generateVAPIDKeys();
+      await getState().setConfig("vapid_public_key", vapidKeys.publicKey);
+      await getState().setConfig("vapid_private_key", vapidKeys.privateKey);
+      const allSubs = getState().setConfig(
+        "push_notification_subscriptions",
+        {}
+      );
+      const newSubs = {};
+      for (const k of Object.keys(allSubs)) {
+        newSubs[k] = [];
+      }
+      await getState().setConfig("push_notification_subscriptions", newSubs);
+      res.json({
+        success: "ok",
+      });
+    }
+  })
+);
+
 router.get(
   "/manifest.json{:opt_cache_bust}",
   error_catcher(async (req, res) => {

package/routes/plugins.js

@@ -1230,9 +1230,7 @@ router.get(
     const mod = await load_plugins.requirePlugin(plugin_db);
     const store_items = await get_store_items();
     const store_item = store_items.find((item) => item.name === name);
-    const update_permitted =
-      db.getTenantSchema() === db.connectObj.default_schema &&
-      plugin_db.source === "npm";
+    const update_permitted = plugin_db.source === "npm";
 
     let latest =
       update_permitted &&

package/routes/search.js

@@ -71,6 +71,14 @@ const searchConfigForm = (tables, views, req) => {
     input_type: "select",
     options: ["Cards", "Tabs"],
   });
+  fields.push({
+    name: "search_disable_fts",
+    label: req.__("Disable full-text search"),
+    type: "Bool",
+    sublabel: req.__(
+      "Use LIKE instead of tsvector. Use to match against phrase in the middle of a word."
+    ),
+  });
   const blurb1 = req.__(
     `Choose views for <a href="/search">search results</a> for each table.<br/>Set to blank to omit table from global search.`
   );
@@ -112,6 +120,10 @@ router.get(
       "search_results_decoration",
       "Cards"
     );
+    form.values.search_disable_fts = getState().getConfig(
+      "search_disable_fts",
+      true
+    );
     send_infoarch_page({
       res,
       req,
@@ -154,6 +166,10 @@ router.post(
         "search_results_decoration",
         result.success.search_results_decoration || "Cards"
       );
+      await getState().setConfig(
+        "search_disable_fts",
+        result.success.search_disable_fts || false
+      );
       await getState().setConfig("search_use_websearch", +dbversion >= 11.0);
       delete result.success.search_table_description;
       delete result.success.search_results_decoration;
@@ -235,7 +251,9 @@ const runSearch = async ({ q, _page, table }, req, res) => {
       viewName === "search_table_description" ||
       tableName === "search_table_description" ||
       viewName === "search_results_decoration" ||
-      tableName === "search_results_decoration"
+      tableName === "search_results_decoration" ||
+      viewName === "search_disable_fts" ||
+      tableName === "search_disable_fts"
     )
       continue;
     tablesConfigured += 1;
@@ -367,7 +385,10 @@ router.get(
   "/",
   error_catcher(async (req, res, next) => {
     const state = getState();
-    const maintenanceModeEnabled = state.getConfig("maintenance_mode_enabled", false);
+    const maintenanceModeEnabled = state.getConfig(
+      "maintenance_mode_enabled",
+      false
+    );
 
     if (maintenanceModeEnabled && (!req.user || req.user.role_id > 1)) {
       res.status(503).send("Page Unavailable: in maintenance mode");

package/routes/tenant.js

@@ -435,7 +435,10 @@ router.get(
               {
                 label: req.__("Subdomain"),
                 key: (r) =>
-                  link(getNewURL(req, r.subdomain, get_cfg_tenant_base_url(req)), text(r.subdomain)),
+                  link(
+                    getNewURL(req, r.subdomain, get_cfg_tenant_base_url(req)),
+                    text(r.subdomain)
+                  ),
               },
               {
                 label: req.__("Description"),
@@ -909,6 +912,7 @@ router.post(
     const { sub } = req.params;
     // todo warning before deletion
     await deleteTenant(sub);
+    await User.destroy_all_tenant_sessions(sub);
     res.redirect(`/tenant/list`);
   })
 );

package/serve.js

@@ -111,7 +111,8 @@ const ensurePluginsFolder = async () => {
         const pluginDir = path.join(
           rootFolder,
           plugin.source === "git" ? "git_plugins" : "plugins_folder",
-          ...tokens
+          ...tokens,
+          plugin.version || "unknownversion"
         );
         allPluginFolders.add(pluginDir);
       }
@@ -142,6 +143,29 @@ const ensurePluginsFolder = async () => {
   }
 };
 
+/**
+ * Users with push_notify enabled store subscription in push_notification_subscriptions
+ * This function ensures that enabled users at least have an empty array
+ * and disabled users have no entry
+ */
+const ensureNotificationSubscriptions = async () => {
+  const allSubs = await getConfig("push_notification_subscriptions", {});
+  let changed = false;
+  for (const user of await User.find()) {
+    const enabled = user._attributes?.notify_push || false;
+    if (enabled && !allSubs[user.id]) {
+      allSubs[user.id] = [];
+      changed = true;
+    } else if (!enabled && allSubs[user.id]) {
+      delete allSubs[user.id];
+      changed = true;
+    }
+  }
+  if (changed) {
+    await setConfig("push_notification_subscriptions", { ...allSubs });
+  }
+};
+
 // helpful https://gist.github.com/jpoehls/2232358
 /**
  * @param {object} opts
@@ -194,7 +218,6 @@ const initMaster = async ({ disableMigrate }, useClusterAdaptor = true) => {
 /**
  * @param {object} opts
  * @param {object} opts.tenant
- * @param {...*} opts.msg
  * @returns {void}
  */
 const workerDispatchMsg = ({ tenant, ...msg }) => {
@@ -302,6 +325,7 @@ module.exports =
       ensureJwtSecret();
       await ensureEnginesCache();
       await ensurePluginsFolder();
+      await ensureNotificationSubscriptions();
     }
     process.on("unhandledRejection", (reason, p) => {
       console.error(reason, "Unhandled Rejection at Promise");
@@ -594,10 +618,9 @@ const setupSocket = (subdomainOffset, pruneSessionInterval, ...servers) => {
             "joined_real_time_socket_ids"
           );
           socketIds.push(socket.id);
-          await getState().setConfig(
-            "joined_real_time_socket_ids",
-            [...socketIds]
-          );
+          await getState().setConfig("joined_real_time_socket_ids", [
+            ...socketIds,
+          ]);
           if (typeof callback === "function") callback({ status: "ok" });
         } catch (err) {
           getState().log(1, `Socket join_collab_room: ${err.stack}`);

package/tests/plugin_install.test.js

@@ -178,7 +178,7 @@ describe("Stable versioning install", () => {
       name: "@christianhugoch/empty_sc_test_plugin",
     });
     expect(dbPlugin).not.toBe(null);
-    expect(dbPlugin.version).toBe("0.1.0");
+    expect(dbPlugin.version).toBe("0.0.5");
   });
 
   it("installs and downgrades a fixed version", async () => {

package/tests/tenant.test.js

@@ -84,7 +84,7 @@ describe("tenant routes", () => {
         .expect(toInclude("E-mail"));
     });
 
-    it("delete tenant", async () => {
+    /*it("delete tenant", async () => {
       const loginCookie = await getAdminLoginCookie();
 
       const app = await getApp({ disableCsrf: true });
@@ -92,7 +92,7 @@ describe("tenant routes", () => {
         .post("/tenant/delete/peashoot")
         .set("Cookie", loginCookie)
         .expect(toRedirect("/tenant/list"));
-    });
+    });*/
   } else {
     it("does not support tenants on SQLite", async () => {
       expect(db.isSQLite).toBe(true);

package/wrapper.js

@@ -248,6 +248,7 @@ const get_headers = (req, version_tag, description, extras = []) => {
   const favicon = state.getConfig("favicon_id", null);
   const notification_in_menu = state.getConfig("notification_in_menu");
   const pwa_enabled = state.getConfig("pwa_enabled");
+  const push_notify_enabled = state.getConfig("enable_push_notify", false);
   const is_root = req.user?.role_id === 1;
 
   const iconHeader = favicon
@@ -304,12 +305,29 @@ const get_headers = (req, version_tag, description, extras = []) => {
         is_root ? new Date().valueOf() : ""
       }">`,
     });
+  }
+  if (pwa_enabled || (push_notify_enabled && req.user?.id)) {
     from_cfg.push({
       scriptBody: `if('serviceWorker' in navigator) {
         navigator.serviceWorker.register('/serviceworker.js', { scope: '/' });
       }`,
     });
   }
+  if (push_notify_enabled && req.user?.id) {
+    const allSubs = getState().getConfig("push_notification_subscriptions", {});
+    const userSubs = allSubs[req.user.id];
+    const userEnabled = !!userSubs;
+    const vapidPublicKey = getState().getConfig("vapid_public_key");
+    const userEndpoints = userSubs ? userSubs.map((sub) => sub.endpoint) : [];
+    from_cfg.push({
+      scriptBody: `var push_notify_cfg = ${JSON.stringify({
+        enabled: true,
+        userEnabled: userEnabled,
+        vapidPublicKey,
+        endpoints: userEndpoints,
+      })}`,
+    });
+  }
   return [
     ...stdHeaders,
     ...iconHeader,