@saltcorn/server 1.3.0-beta.9 → 1.3.1-beta.0

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,