@saltcorn/server 1.5.0-beta.13 → 1.5.0-beta.14

package/routes/notifications.js

@@ -14,6 +14,7 @@ const Form = require("@saltcorn/data/models/form");
 const File = require("@saltcorn/data/models/file");
 const User = require("@saltcorn/data/models/user");
 const Trigger = require("@saltcorn/data/models/trigger");
+const Table = require("@saltcorn/data/models/table");
 const { renderForm, post_btn } = require("@saltcorn/markup");
 const db = require("@saltcorn/data/db");
 
@@ -23,7 +24,10 @@ module.exports = router;
 router.use(
   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");
       return;
@@ -348,55 +352,45 @@ router.post(
 );
 
 router.post(
-  "/fcm-token",
+  "/mobile-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"),
+    const { token, deviceId, synchedTables } = 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 {
-      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
+      userSubs = userSubs.filter(
+        (s) => s.type !== "fcm-push" || 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"),
-        });
-      }
+      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"),
+      });
     }
   })
 );
@@ -438,6 +432,48 @@ router.post(
   })
 );
 
+// TODO
+router.post(
+  "/mobile-remove-subscription",
+  loggedIn,
+  error_catcher(async (req, res) => {
+    res.json({
+      success: "ok",
+      message: req.__("Unsubscribed from notifications"),
+    });
+  })
+);
+
+router.post(
+  "/mobile-remove-subscription",
+  loggedIn,
+  error_catcher(async (req, res) => {
+    const { token, deviceId } = req.body || {};
+    if (!token) {
+      res.status(400).json({
+        error: req.__("FCM token is required"),
+      });
+      return;
+    }
+    const user = req.user;
+    const oldSubs = getState().getConfig("push_notification_subscriptions", {});
+    let userSubs = oldSubs[user.id];
+    if (userSubs) {
+      userSubs = userSubs.filter(
+        (s) => s.type !== "fcm-push" || s.deviceId !== deviceId
+      );
+      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,

package/routes/sync.js

@@ -1,4 +1,4 @@
-const { error_catcher } = require("./utils.js");
+const { error_catcher, loggedIn } = require("./utils.js");
 const Router = require("express-promise-router");
 const db = require("@saltcorn/data/db");
 const { getState } = require("@saltcorn/data/db/state");
@@ -337,3 +337,81 @@ router.post(
     }
   })
 );
+
+router.post(
+  "/push_subscribe",
+  loggedIn,
+  error_catcher(async (req, res) => {
+    const { token, deviceId, synchedTables } = req.body || {};
+    if (!token) {
+      res.status(400).json({
+        error: req.__("FCM token is required"),
+      });
+      return;
+    }
+
+    const user = req.user;
+    const state = getState();
+    const allSubs = state.getConfig("push_sync_subscriptions", {});
+    let userSubs = allSubs[user.id] || [];
+    const existingSub = userSubs.find(
+      (s) => s.token === token && s.deviceId === deviceId
+    );
+    if (existingSub) {
+      res.json({
+        success: "ok",
+        message: req.__("sync push subscription already exists"),
+      });
+    } else {
+      userSubs = userSubs.filter((s) => s.deviceId !== deviceId);
+      userSubs.push({
+        token,
+        deviceId,
+        synchedTables,
+      });
+      await getState().setConfig("push_sync_subscriptions", {
+        ...allSubs,
+        [user.id]: userSubs,
+      });
+      res.json({
+        success: "ok",
+        message: req.__("sync push subscription saved"),
+      });
+    }
+  })
+);
+
+router.post(
+  "/push_unsubscribe",
+  loggedIn,
+  error_catcher(async (req, res) => {
+    const { token, deviceId } = req.body || {};
+    if (!token) {
+      res.status(400).json({
+        error: req.__("FCM token is required"),
+      });
+      return;
+    }
+
+    const user = req.user;
+    const state = getState();
+    const allSubs = state.getConfig("push_sync_subscriptions", {});
+    let userSubs = allSubs[user.id] || [];
+    const newUserSubs = userSubs.filter((s) => s.deviceId !== deviceId);
+    if (newUserSubs.length === userSubs.length) {
+      res.json({
+        success: "ok",
+        message: req.__("FCM token not found"),
+      });
+    } else {
+      await getState().setConfig("push_sync_subscriptions", {
+        ...allSubs,
+        [user.id]: newUserSubs,
+      });
+      res.json({
+        success: "ok",
+        message: req.__("sync push subscription removed"),
+      });
+    }
+  })
+);

package/tests/page_group.test.js

@@ -71,7 +71,6 @@ describe("edit Page groups", () => {
     expect(resp.statusCode).toEqual(200);
     expect(resp._body.row).toEqual({
       name: nameAfterUpdate,
-      description: null,
       min_role: 100,
       random_allocation: false,
     });

package/help/Firebase JSON key.tmd

@@ -1,20 +0,0 @@
-## Upload Your Firebase Service Account Key (JSON)
-
-To integrate with Firebase, you'll need to select a **Service Account JSON key file**. This file allows secure communication with Firebase services such as Google Cloud Messaging.
-
----
-
-To see the file here, please upload it into your Saltcorn Filesystem.
-
-### What is this file?
-
-This is a **private key file** generated by Firebase. It contains credentials for a **Service Account** that grants access to your Firebase project’s backend services. The file ends with `.json` and includes fields like:
-
-```json
-{
-  "type": "service_account",
-  "project_id": "your-project-id",
-  "private_key_id": "abc123...",
-  "private_key": "-----BEGIN PRIVATE KEY-----\n...\n-----END PRIVATE KEY-----\n",
-  "client_email": "firebase-adminsdk-xxxxx@your-project-id.iam.gserviceaccount.com"
-}

package/help/Google Services File.tmd

@@ -1,30 +0,0 @@
-## Upload Your `google-services.json` File for Firebase Cloud Messaging
-
-To enable Firebase Cloud Messaging (FCM) integration, you need to select your app’s `google-services.json` file. This file links your Android app to your Firebase project and enables services like messaging, analytics, and more.
-
----
-
-To see the file here, please upload it into your Saltcorn Filesystem.
-
-### What is `google-services.json`?
-
-This is a configuration file automatically generated by Firebase when you register an Android app with your Firebase project. It contains credentials and identifiers for Firebase services, such as:
-
-```json
-{
-  "project_info": {
-    "project_number": "1234567890",
-    "project_id": "your-project-id"
-  },
-  "client": [
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:1234567890:android:abcdefg12345",
-        "android_client_info": {
-          "package_name": "com.yourapp.package"
-        }
-      },
-      ...
-    }
-  ]
-}