@saltcorn/server 1.3.0 → 1.3.1-beta.1

package/routes/admin.js

@@ -2360,6 +2360,7 @@ router.get(
     const images = (await File.find({ mime_super: "image" })).filter((image) =>
       image.filename?.endsWith(".png")
     );
+    const files = await File.find({ folder: "/" });
     const keystoreFiles = await File.find({ folder: "keystore_files" });
     const provisioningFiles = await File.find({ folder: "provisioning_files" });
     const withSyncInfo = await Table.find({ has_sync_info: true });
@@ -2377,6 +2378,7 @@ router.get(
     const xcodebuildVersion = xcodeCheckRes.version;
     const layout = getState().getLayout(req.user);
     const isSbadmin2 = layout === getState().layouts.sbadmin2;
+    const pushEnabled = getState().getConfig("enable_push_notify", false);
     send_admin_page({
       res,
       req,
@@ -3245,7 +3247,50 @@ router.get(
                             placeholder: "",
                           })
                         )
-                      )
+                      ),
+                      // google-services.json file
+                      pushEnabled
+                        ? div(
+                            { class: "row pb-3" },
+                            div(
+                              { class: "col-sm-8" },
+                              label(
+                                {
+                                  for: "googleServicesInputId",
+                                  class: "form-label fw-bold",
+                                },
+                                req.__("Google Services File"),
+                                a(
+                                  {
+                                    href: "javascript:ajax_modal('/admin/help/Google Services File?')",
+                                  },
+                                  i({ class: "fas fa-question-circle ps-1" })
+                                )
+                              ),
+                              select(
+                                {
+                                  class: "form-select",
+                                  name: "googleServicesFile",
+                                  id: "googleServicesInputId",
+                                },
+                                [
+                                  option({ value: "" }, ""),
+                                  ...files.map((file) =>
+                                    option(
+                                      {
+                                        value: file.location,
+                                        selected:
+                                          builderSettings.googleServicesFile ===
+                                          file.location,
+                                      },
+                                      file.filename
+                                    )
+                                  ),
+                                ].join("")
+                              )
+                            )
+                          )
+                        : ""
                     )
                   ),
                   div(
@@ -3685,6 +3730,7 @@ router.post(
       keystoreFile,
       keystoreAlias,
       keystorePassword,
+      googleServicesFile,
     } = req.body || {};
     const receiveShareTriggers = Trigger.find({
       when_trigger: "ReceiveMobileShareData",
@@ -3825,6 +3871,8 @@ router.post(
       spawnParams.push("--androidKeyStoreAlias", keystoreAlias);
     if (keystorePassword)
       spawnParams.push("--androidKeystorePassword", keystorePassword);
+    if (googleServicesFile)
+      spawnParams.push("--googleServicesFile", googleServicesFile);
 
     // if builDir exists, remove it
     if (
@@ -4504,24 +4552,31 @@ admin_config_route({
     { section_header: "Push Notifications" },
     "enable_push_notify",
     {
-      name: "vapid_public_key",
+      name: "push_notification_icon",
       showIf: { enable_push_notify: true },
     },
     {
-      name: "vapid_private_key",
+      name: "push_notification_badge",
       showIf: { enable_push_notify: true },
     },
+    { section_header: "Web push" },
     {
-      name: "vapid_email",
+      name: "vapid_public_key",
       showIf: { enable_push_notify: true },
     },
     {
-      name: "push_notification_icon",
+      name: "vapid_private_key",
       showIf: { enable_push_notify: true },
     },
     {
-      name: "push_notification_badge",
+      name: "vapid_email",
+      showIf: { enable_push_notify: true },
+    },
+    { section_header: "Native Android" },
+    {
+      name: "firebase_json_key",
       showIf: { enable_push_notify: true },
+      help: { topic: "Firebas JSON key" },
     },
   ],
   response(form, req, res) {

package/routes/fields.js

@@ -629,7 +629,7 @@ const fieldFlow = (req) =>
                 type: "String",
                 class: "validate-expression",
                 fieldview: "textarea",
-                attributes: { rows: 2 },
+                attributes: { rows: 2, unsafe: true },
                 validator: expressionValidator,
                 showIf: { expression_type: "JavaScript expression" },
               }),
@@ -1433,8 +1433,16 @@ router.post(
       const inboundTable = Table.findOne(inboundTableName);
       field = inboundTable.getField(refField);
     }
-
+    if (
+      !field &&
+      table.name === "users" &&
+      ["passwordRepeat", "password"].includes(fieldName)
+    ) {
+      field = new Field({ name: fieldName, type: "String" });
+    }
     if (!field) {
+      console.log("no field");
+
       res.send(req.query?.accept == "json" ? "[]" : "");
       return;
     }

package/routes/notifications.js

@@ -32,14 +32,19 @@ router.use(
   })
 );
 
-const notificationSettingsForm = () => {
+const notificationSettingsForm = (user) => {
   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",
-    });
+  if (getState().getConfig("enable_push_notify", false)) {
+    const policyByRole = getState()?.getConfig("push_policy_by_role") || {};
+    const pushPolicy = policyByRole[user?.role_id || 100] || "Default on";
+    if (!["Always", "Never"].includes(pushPolicy)) {
+      fields.push({
+        name: "notify_push",
+        label: "Push",
+        type: "Bool",
+      });
+    }
+  }
 
   return new Form({
     action: `/notifications/settings`,
@@ -74,12 +79,23 @@ router.get(
             }
       );
 
-    const form = notificationSettingsForm();
+    const form = notificationSettingsForm(req.user);
     const user = await User.findOne({ id: req.user?.id });
     form.values = {
       notify_email: user?._attributes?.notify_email,
-      notify_push: user?._attributes?.notify_push,
     };
+
+    if (getState().getConfig("enable_push_notify", false)) {
+      let notifPushAttr = user?._attributes?.notify_push;
+      if (notifPushAttr === undefined) {
+        const policyByRole = getState()?.getConfig("push_policy_by_role") || {};
+        const pushPolicy = policyByRole[user.role_id || 100] || "Default on";
+        if (pushPolicy === "Default on") notifPushAttr = true;
+        else if (pushPolicy === "Default off") notifPushAttr = false;
+      }
+      form.values.notify_push = notifPushAttr;
+    }
+
     const notifyCards = nots.length
       ? nots.map((not) => ({
           type: "card",
@@ -193,11 +209,23 @@ router.post(
   loggedIn,
   error_catcher(async (req, res) => {
     const user = await User.findOne({ id: req.user.id });
-    const form = notificationSettingsForm();
+    const form = notificationSettingsForm(req.user);
     form.validate(req.body || {});
     const _attributes = { ...user._attributes, ...form.values };
+
+    // apply push enabled policy if needed
+    if (getState().getConfig("enable_push_notify", false)) {
+      const policyByRole = getState()?.getConfig("push_policy_by_role") || {};
+      const pushPolicy = policyByRole[user.role_id || 100] || "Default on";
+      if (pushPolicy === "Always") _attributes.notify_push = true;
+      else if (pushPolicy === "Never") _attributes.notify_push = false;
+      else if (_attributes.notify_push === undefined) {
+        _attributes.notify_push = pushPolicy === "Default on";
+      }
+    }
+
     await user.update({ _attributes });
-    const pushEnabled = !!_attributes.notify_push;
+    const pushEnabled = _attributes.notify_push;
     const allSubs = getState().getConfig("push_notification_subscriptions", {});
     const newSubs = { ...allSubs };
     if (!pushEnabled && newSubs[req.user.id]) {
@@ -295,10 +323,11 @@ router.post(
       if (existingSub) {
         res.json({
           success: "ok",
-          message: req.__("Subscribed to notifications"),
+          message: req.__("Already subscribed to notifications"),
         });
       } else {
         userSubs.push({
+          type: "web-push",
           endpoint: req.body.endpoint,
           keys: {
             auth: req.body.keys.auth,
@@ -318,6 +347,60 @@ router.post(
   })
 );
 
+router.post(
+  "/fcm-token",
+  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 { token, deviceId } = req.body || {};
+      if (!token) {
+        res.status(400).json({
+          error: req.__("FCM token is required"),
+        });
+        return;
+      }
+      const user = req.user;
+      const allSubs = getState().getConfig(
+        "push_notification_subscriptions",
+        {}
+      );
+      let userSubs = allSubs[user.id] || [];
+      const existingSub = userSubs.find(
+        (s) =>
+          s.type === "fcm-push" && s.token === token && s.deviceId === deviceId
+      );
+      if (existingSub) {
+        res.json({
+          success: "ok",
+          message: req.__("FCM token already uploaded"),
+        });
+      } else {
+        userSubs = userSubs.filter(
+          (s) => s.type !== "fcm-push" || s.deviceId !== deviceId
+        );
+        userSubs.push({
+          type: "fcm-push",
+          token: token,
+          deviceId: deviceId,
+        });
+        await getState().setConfig("push_notification_subscriptions", {
+          ...allSubs,
+          [user.id]: userSubs,
+        });
+        res.json({
+          success: "ok",
+          message: req.__("FCM token uploaded"),
+        });
+      }
+    }
+  })
+);
+
 router.post(
   "/remove-subscription",
   loggedIn,

package/routes/pageedit.js

@@ -174,7 +174,9 @@ const pageBuilderData = async (req, context) => {
   const actions = [
     "GoBack",
     ...Object.entries(stateActions)
-      .filter(([k, v]) => !v.requireRow && !v.disableInBuilder)
+      .filter(
+        ([k, v]) => !v.requireRow && !v.disableInBuilder && !v.disableIf?.()
+      )
       .map(([k, v]) => k),
   ];
   const triggers = await Trigger.find({
@@ -183,6 +185,9 @@ const pageBuilderData = async (req, context) => {
   triggers.forEach((tr) => {
     actions.push(tr.name);
   });
+  const triggerActions = Trigger.trigger_actions({
+    apiNeverTriggers: true,
+  });
   const actionConfigForms = {};
   for (const name of actions) {
     const action = stateActions[name];
@@ -247,6 +252,7 @@ const pageBuilderData = async (req, context) => {
     page_groups,
     actions: actionsNotRequiringRow,
     builtInActions: ["GoBack"],
+    triggerActions,
     library,
     min_role: context.min_role,
     actionConfigForms,

package/serve.js

@@ -209,7 +209,6 @@ const initMaster = async ({ disableMigrate }, useClusterAdaptor = true) => {
     const state = getState();
     if (state) {
       await state.setConfig("joined_log_socket_ids", []);
-      await state.setConfig("joined_real_time_socket_ids", []);
     }
   });
   if (useClusterAdaptor) setupPrimary();
@@ -614,13 +613,6 @@ const setupSocket = (subdomainOffset, pruneSessionInterval, ...servers) => {
           if (view.min_role < role_id)
             throw new Error("Not authorized to join collaboration room");
           socket.join(`_${tenant}_collab_room_`);
-          const socketIds = await getState().getConfig(
-            "joined_real_time_socket_ids"
-          );
-          socketIds.push(socket.id);
-          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/wrapper.js

@@ -8,6 +8,7 @@ const { get_extra_menu } = require("@saltcorn/data/web-mobile-commons");
 const { h3, div, small, domReady } = require("@saltcorn/markup/tags");
 const { renderForm, link } = require("@saltcorn/markup");
 const renderLayout = require("@saltcorn/markup/layout");
+const { isPushEnabled } = require("@saltcorn/data/utils");
 /**
  * get flashes
  * @param req
@@ -316,7 +317,7 @@ const get_headers = (req, version_tag, description, extras = []) => {
   if (push_notify_enabled && req.user?.id) {
     const allSubs = getState().getConfig("push_notification_subscriptions", {});
     const userSubs = allSubs[req.user.id];
-    const userEnabled = !!userSubs;
+    const userEnabled = !!userSubs || isPushEnabled(req.user);
     const vapidPublicKey = getState().getConfig("vapid_public_key");
     const userEndpoints = userSubs ? userSubs.map((sub) => sub.endpoint) : [];
     from_cfg.push({