@saltcorn/server 1.3.0 → 1.3.1-beta.0

package/help/Firebase JSON key.tmd

@@ -0,0 +1,20 @@
+## 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

@@ -0,0 +1,30 @@
+## 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"
+        }
+      },
+      ...
+    }
+  ]
+}

package/help/VAPID configuration.tmd

@@ -0,0 +1 @@
+TODO

package/locales/en.json

@@ -1624,5 +1624,24 @@
 	"Button Style": "Button Style",
 	"Disable full-text search": "Disable full-text search",
 	"Use LIKE instead of tsvector. Use to match against phrase in the middle of a word.": "Use LIKE instead of tsvector. Use to match against phrase in the middle of a word.",
-	"Model configuration": "Model configuration"
+	"Model configuration": "Model configuration",
+	"Push Notifications": "Push Notifications",
+	"Push Notifications enabled": "Push Notifications enabled",
+	"VAPID public key": "VAPID public key",
+	"Public key for VAPID authentication in web push notifications": "Public key for VAPID authentication in web push notifications",
+	"VAPID private key": "VAPID private key",
+	"Private key for VAPID authentication in web push notifications": "Private key for VAPID authentication in web push notifications",
+	"VAPID email": "VAPID email",
+	"Email address for VAPID authentication in web push notifications. Usually, it is your email address.": "Email address for VAPID authentication in web push notifications. Usually, it is your email address.",
+	"Web push icon": "Web push icon",
+	"Select a publicly accessible square image file": "Select a publicly accessible square image file",
+	"Web push badge": "Web push badge",
+	"Select a publicly accessible monochrome square image file (prefarbly 72x72px)": "Select a publicly accessible monochrome square image file (prefarbly 72x72px)",
+	"Comma-separated list of relative URL route prefixes where CSRF token checking is disabled. Example: <code>/files/upload, /auth/signup</code>": "Comma-separated list of relative URL route prefixes where CSRF token checking is disabled. Example: <code>/files/upload, /auth/signup</code>",
+	"Push icon": "Push icon",
+	"Push badge": "Push badge",
+	"Web push": "Web push",
+	"Native Android": "Native Android",
+	"Firebase JSON key": "Firebase JSON key",
+	"This is your Firebase Service Account JSON key file. ": "This is your Firebase Service Account JSON key file. "
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/server",
-  "version": "1.3.0",
+  "version": "1.3.1-beta.0",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
@@ -8,14 +8,14 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.735.0",
     "@dr.pogodin/csurf": "1.15.0",
-    "@saltcorn/admin-models": "1.3.0",
-    "@saltcorn/base-plugin": "1.3.0",
-    "@saltcorn/builder": "1.3.0",
-    "@saltcorn/data": "1.3.0",
-    "@saltcorn/filemanager": "1.3.0",
-    "@saltcorn/markup": "1.3.0",
-    "@saltcorn/plugins-loader": "1.3.0",
-    "@saltcorn/sbadmin2": "1.3.0",
+    "@saltcorn/admin-models": "1.3.1-beta.0",
+    "@saltcorn/base-plugin": "1.3.1-beta.0",
+    "@saltcorn/builder": "1.3.1-beta.0",
+    "@saltcorn/data": "1.3.1-beta.0",
+    "@saltcorn/filemanager": "1.3.1-beta.0",
+    "@saltcorn/markup": "1.3.1-beta.0",
+    "@saltcorn/plugins-loader": "1.3.1-beta.0",
+    "@saltcorn/sbadmin2": "1.3.1-beta.0",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.16",

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" },
               }),

package/routes/notifications.js

@@ -295,10 +295,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 +319,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

@@ -183,6 +183,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 +250,7 @@ const pageBuilderData = async (req, context) => {
     page_groups,
     actions: actionsNotRequiringRow,
     builtInActions: ["GoBack"],
+    triggerActions,
     library,
     min_role: context.min_role,
     actionConfigForms,