@saltcorn/server 1.6.0-alpha.1 → 1.6.0-alpha.2

package/routes/files.js

@@ -8,6 +8,7 @@
 const Router = require("express-promise-router");
 const File = require("@saltcorn/data/models/file");
 const User = require("@saltcorn/data/models/user");
+const Form = require("@saltcorn/data/models/form");
 const { getState } = require("@saltcorn/data/db/state");
 const s3storage = require("../s3storage");
 const resizer = require("resize-with-sharp-or-jimp");
@@ -854,3 +855,193 @@ router.post(
     }
   })
 );
+
+const editableExtensions = [
+  "html",
+  "css",
+  "js",
+  "jsx",
+  "ts",
+  "tsx",
+  "sql",
+  "py",
+  "bash",
+  "sh",
+  "txt",
+  "json",
+  "md",
+  "yml",
+];
+
+/**
+ * GET load the file editor
+ */
+router.get(
+  "/edit/*serve_path",
+  error_catcher(async (req, res) => {
+    const role = req.user && req.user.id ? req.user.role_id : 100;
+    const user_id = req.user && req.user.id;
+    const serve_path = path.join(...req.params.serve_path);
+    const file = await File.findOne(serve_path);
+    if (
+      file &&
+      (role <= file.min_role_read || (user_id && user_id === file.user_id))
+    ) {
+      try {
+        if (file.isDirectory) {
+          res
+            .status(400)
+            .sendWrap(
+              req.__("Error"),
+              h1(req.__("File not editable")) +
+                div(req.__("Directories cannot be edited"))
+            );
+          return;
+        }
+        const ext = path.extname(file.filename).toLowerCase().slice(1);
+        if (!editableExtensions.includes(ext)) {
+          res
+            .status(400)
+            .sendWrap(
+              req.__("Error"),
+              h1(req.__("File not editable")) +
+                div(req.__("Files of this type cannot be edited"))
+            );
+          return;
+        }
+        const fileContent = await fs.promises.readFile(file.location, "utf8");
+        const form = new Form({
+          action: `/files/edit/${encodeURIComponent(serve_path)}`,
+          onChange: "saveAndContinue(this)",
+          submitLabel: req.__("Done"),
+          noSubmitButton: true,
+          noLabelCols: true,
+          fields: [
+            {
+              name: "value",
+              label: " ",
+              input_type: "code",
+              class: ["validate-statements", "enlarge-in-card"],
+              attributes: {
+                mode: `${file.mime_super}/${file.mime_sub}`,
+              },
+            },
+          ],
+          additionalButtons: [
+            {
+              label: req.__("Save"),
+              id: "btnSaveId",
+              class: "btn btn-primary",
+              type: "submit",
+            },
+            {
+              label: req.__("Close"),
+              class: "btn btn-secondary ms-2",
+              onclick: `location.href='/files?dir=${encodeURIComponent(
+                file.current_folder
+              )}'`,
+            },
+          ],
+        });
+
+        form.values = { value: fileContent };
+        res.sendWrap(req.__("Edit file"), {
+          above: [
+            {
+              type: "breadcrumbs",
+              crumbs: [
+                { text: req.__("Settings"), href: "/settings" },
+                { text: req.__("Files"), href: "/files" },
+                { text: req.__("Edit"), href: null },
+              ],
+            },
+            {
+              title: req.__("Editing %s", file.filename),
+              type: "card",
+              contents: renderForm(form, req.csrfToken()),
+            },
+          ],
+        });
+      } catch (err) {
+        getState().log(3, `Error reading file ${serve_path}: ${err.message}`);
+        res
+          .status(500)
+          .sendWrap(
+            req.__("Error"),
+            h1(req.__("Error reading file")) + div(err.message)
+          );
+      }
+    } else {
+      res
+        .status(404)
+        .sendWrap(req.__("Not found"), h1(req.__("File not found")));
+    }
+  })
+);
+
+/**
+ * POST edit a file from the editor
+ */
+router.post(
+  "/edit/*serve_path",
+  error_catcher(async (req, res) => {
+    const role = req.user && req.user.id ? req.user.role_id : 100;
+    const user_id = req.user && req.user.id;
+    const serve_path = path.join(...req.params.serve_path);
+    const file = await File.findOne(serve_path);
+    if (
+      file &&
+      (role <= file.min_role_read || (user_id && user_id === file.user_id))
+    ) {
+      try {
+        if (file.isDirectory) {
+          if (req.xhr) res.json({ error: "Directories cannot be edited" });
+          else
+            res
+              .status(400)
+              .sendWrap(
+                req.__("Error"),
+                h1(req.__("File not editable")) +
+                  div(req.__("Directories cannot be edited"))
+              );
+
+          return;
+        }
+        const ext = path.extname(file.filename).toLowerCase().slice(1);
+        if (!editableExtensions.includes(ext)) {
+          if (req.xhr)
+            res.json({ error: "Files of this type cannot be edited" });
+          else
+            res
+              .status(400)
+              .sendWrap(
+                req.__("Error"),
+                h1(req.__("File not editable")) +
+                  div(req.__("Files of this type cannot be edited"))
+              );
+          return;
+        }
+        const newContent = req.body.value;
+        await fs.promises.writeFile(file.location, newContent, "utf8");
+        if (req.xhr) res.json({ success: true });
+        else {
+          const currentFolder = file.current_folder;
+          res.redirect(`/files${currentFolder ? `?dir=${currentFolder}` : ""}`);
+        }
+      } catch (err) {
+        getState().log(3, `Error writing file ${serve_path}: ${err.message}`);
+        if (req.xhr) res.json({ error: err.message });
+        else {
+          req.flash("error", err.message);
+          res.redirect(`/files/edit/${encodeURIComponent(serve_path)}`);
+        }
+      }
+    } else {
+      if (req.xhr) res.status(404).json({ error: "File not found" });
+      else {
+        req.flash("error", req.__("File not found"));
+        res.redirect("/files");
+      }
+    }
+  })
+);

package/routes/notifications.js

@@ -355,7 +355,7 @@ router.post(
   "/mobile-subscribe",
   loggedIn,
   error_catcher(async (req, res) => {
-    const { token, deviceId, synchedTables } = req.body || {};
+    const { token, deviceId, platform } = req.body || {};
     if (!token) {
       res.status(400).json({
         error: req.__("FCM token is required"),
@@ -375,11 +375,14 @@ router.post(
         message: req.__("FCM token already uploaded"),
       });
     } else {
+      // web based subscriptions and other device subscriptions for this user
       userSubs = userSubs.filter(
-        (s) => s.type !== "fcm-push" || s.deviceId !== deviceId
+        (s) =>
+          (s.type !== "fcm-push" && s.type !== "apns-push") ||
+          s.deviceId !== deviceId
       );
       userSubs.push({
-        type: "fcm-push",
+        type: platform === "android" ? "fcm-push" : "apns-push",
         token: token,
         deviceId: deviceId,
       });
@@ -432,18 +435,6 @@ 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,
@@ -533,9 +524,7 @@ router.get(
     }
     if (Array.isArray(pwa_icons) && pwa_icons.length > 0)
       manifest.icons = pwa_icons.map(({ image, size, maskable }) => ({
-        src: /^(?:[a-z]+:)?\/\//i.test(image)
-          ? image
-          : `/files/serve/${image}`,
+        src: /^(?:[a-z]+:)?\/\//i.test(image) ? image : `/files/serve/${image}`,
         type: File.nameToMimeType(image),
         sizes: size ? `${size}x${size}` : "144x144",
         ...(maskable ? { purpose: "maskable" } : {}),

package/routes/plugins.js

@@ -572,6 +572,7 @@ const plugin_store_html = (items, req) => {
             search_bar("q", req.query.q || "", {
               placeHolder: req.__("Search for..."),
               stateField: "q",
+              autofocus: true,
             })
           ),
           div(store_actions_dropdown(req))

package/routes/registry.js

@@ -276,6 +276,7 @@ router.get(
                     placeholder: "Search",
                     name: "q",
                     value: q,
+                    autofocus: true,
                     "aria-label": "Search",
                     "aria-describedby": "button-search-submit",
                   }),

package/routes/sync.js

@@ -361,7 +361,7 @@ router.post(
   "/push_subscribe",
   loggedIn,
   error_catcher(async (req, res) => {
-    const { token, deviceId, synchedTables } = req.body || {};
+    const { token, deviceId, synchedTables, platform } = req.body || {};
     if (!token) {
       res.status(400).json({
         error: req.__("FCM token is required"),
@@ -382,10 +382,12 @@ router.post(
         message: req.__("sync push subscription already exists"),
       });
     } else {
+      // remove old subscriptions for this deviceId before adding
       userSubs = userSubs.filter((s) => s.deviceId !== deviceId);
       userSubs.push({
         token,
         deviceId,
+        type: platform === "android" ? "fcm-push" : "apns-push",
         synchedTables,
       });
       await getState().setConfig("push_sync_subscriptions", {

package/serve.js

@@ -393,6 +393,10 @@ const escapeSingleQuotes = (value) => value.replace(/'/g, "''");
 const initOfflineStoreCfg = async () => {
   const rootState = getState();
   try {
+    if (!Plugin.local_store_entries_exists) {
+      await rootState.setConfig("pre_installed_module_infos", []);
+      return;
+    }
     const entries = await Plugin.read_local_store_entries();
     await rootState.setConfig("pre_installed_module_infos", entries);
   } catch (e) {

package/tests/files.test.js

@@ -20,14 +20,21 @@ const Table = require("@saltcorn/data/models/table");
 const View = require("@saltcorn/data/models/view");
 const { existsSync } = require("fs");
 
-const createTestFile = async (folder, name, mimetype, content) => {
-  if (
-    !existsSync(
-      path.join(db.connectObj.file_store, db.getTenantSchema(), folder, name)
-    )
-  ) {
-    await File.from_contents(name, mimetype, content, 1, 100, folder);
-  }
+const createTestFile = async (
+  folder,
+  name,
+  mimetype,
+  content,
+  minRole = 100
+) => {
+  const fullPath = path.join(
+    db.connectObj.file_store,
+    db.getTenantSchema(),
+    folder,
+    name
+  );
+  if (existsSync(fullPath)) await fs.unlink(fullPath);
+  await File.from_contents(name, mimetype, content, 1, minRole, folder);
 };
 
 const checkFiles = (files, expecteds) =>
@@ -92,6 +99,13 @@ beforeAll(async () => {
     "image/png",
     "imagecontent"
   );
+  await createTestFile(
+    "_sc_test_subfolder_one",
+    "the-script.js",
+    "application/javascript",
+    "console.log('I am a script');",
+    1
+  );
 });
 afterAll(db.close);
 
@@ -191,6 +205,97 @@ describe("files admin", () => {
 
       .expect(toRedirect("/files?dir=."));
   });
+  describe("file editor", () => {
+    it("opens the file editor", async () => {
+      const app = await getApp({ disableCsrf: true });
+      const loginCookie = await getAdminLoginCookie();
+      await request(app)
+        .get(
+          `/files/edit/${encodeURIComponent("_sc_test_subfolder_one/the-script.js")}`
+        )
+        .set("Cookie", loginCookie)
+        .expect(toInclude("console.log('I am a script')"));
+    });
+    it("allows editing and saving a file", async () => {
+      const app = await getApp({ disableCsrf: true });
+      const loginCookie = await getAdminLoginCookie();
+      await request(app)
+        .post(
+          `/files/edit/${encodeURIComponent("_sc_test_subfolder_one/the-script.js")}`
+        )
+        .set("Cookie", loginCookie)
+        .send("value=console.log('I have been edited');")
+        .expect(toRedirect("/files?dir=_sc_test_subfolder_one"));
+    });
+
+    it("does not open for non-existing files", async () => {
+      const app = await getApp({ disableCsrf: true });
+      const loginCookie = await getAdminLoginCookie();
+      await request(app)
+        .get(
+          `/files/edit/${encodeURIComponent("_sc_test_subfolder_one/not-existing.js")}`
+        )
+        .set("Cookie", loginCookie)
+        .expect(toInclude("Not found", 404));
+    });
+    it("denies editing non-existing files", async () => {
+      const app = await getApp({ disableCsrf: true });
+      const loginCookie = await getAdminLoginCookie();
+      await request(app)
+        .post(
+          `/files/edit/${encodeURIComponent("_sc_test_subfolder_one/not-existing.js")}`
+        )
+        .set("Cookie", loginCookie)
+        .send("value=console.log('I have been edited');")
+        .expect(toRedirect("/files"));
+      await request(app)
+        .get("/files")
+        .set("Cookie", loginCookie)
+        .expect(toInclude("File not found"));
+    });
+
+    it("denies access to the file editor", async () => {
+      const app = await getApp({ disableCsrf: true });
+      const loginCookie = await getStaffLoginCookie();
+      await request(app)
+        .get(
+          `/files/edit/${encodeURIComponent("_sc_test_subfolder_one/the-script.js")}`
+        )
+        .set("Cookie", loginCookie)
+        .expect(toInclude("Not found", 404));
+    });
+    it("denies editing a file", async () => {
+      const app = await getApp({ disableCsrf: true });
+      const loginCookie = await getStaffLoginCookie();
+      await request(app)
+        .post(
+          `/files/edit/${encodeURIComponent("_sc_test_subfolder_one/the-script.js")}`
+        )
+        .set("Cookie", loginCookie)
+        .send("value=console.log('I have been edited');")
+        .expect(toRedirect("/files"));
+
+      await request(app)
+        .get("/")
+        .set("Cookie", loginCookie)
+        .expect(toInclude("File not found"));
+    });
+
+    it("does not open for folders or not editable extensions", async () => {
+      const app = await getApp({ disableCsrf: true });
+      const loginCookie = await getAdminLoginCookie();
+      await request(app)
+        .get(`/files/edit/${encodeURIComponent("_sc_test_subfolder_one")}`)
+        .set("Cookie", loginCookie)
+        .expect(toInclude("Directories cannot be edited", 400));
+      await request(app)
+        .get(
+          `/files/edit/${encodeURIComponent("_sc_test_subfolder_one/bar_image.png")}`
+        )
+        .set("Cookie", loginCookie)
+        .expect(toInclude("Files of this type cannot be edited", 400));
+    });
+  });
   it("search files by name", async () => {
     const app = await getApp({ disableCsrf: true });
     const loginCookie = await getAdminLoginCookie();
@@ -417,7 +522,9 @@ describe("visible_entries test", () => {
       .set("Cookie", staffCookie);
     expect(resp.statusCode).toBe(200);
     expect(
-      resp.body.directories.find((file) => file.filename === "_sc_test_subfolder_one/subsubfolder")
+      resp.body.directories.find(
+        (file) => file.filename === "_sc_test_subfolder_one/subsubfolder"
+      )
     ).toBeDefined();
   });