@saltcorn/server 1.1.1-beta.5 → 1.1.1-beta.7

package/routes/viewedit.js

@@ -19,6 +19,7 @@ const {
   addOnDoneRedirect,
   is_relative_url,
   setTenant,
+  isAdminOrHasConfigMinRole,
 } = require("./utils.js");
 const { setTableRefs, viewsList } = require("./common_lists");
 const Form = require("@saltcorn/data/models/form");
@@ -56,7 +57,7 @@ module.exports = router;
  */
 router.get(
   "/",
-  isAdmin,
+  isAdminOrHasConfigMinRole("min_role_edit_views"),
   error_catcher(async (req, res) => {
     let orderBy = "name";
     if (req.query._sortby === "viewtemplate") orderBy = "viewtemplate";
@@ -353,7 +354,7 @@ const viewForm = async (req, tableOptions, roles, pages, values) => {
  */
 router.get(
   "/edit/:viewname",
-  isAdmin,
+  isAdminOrHasConfigMinRole("min_role_edit_views"),
   error_catcher(async (req, res) => {
     const { viewname } = req.params;
 
@@ -446,7 +447,7 @@ router.get(
  */
 router.get(
   "/new",
-  isAdmin,
+  isAdminOrHasConfigMinRole("min_role_edit_views"),
   error_catcher(async (req, res) => {
     const tables = await Table.find_with_external();
     const tableOptions = tables.map((t) => t.name);
@@ -484,7 +485,7 @@ router.get(
  */
 router.post(
   "/save",
-  isAdmin,
+  isAdminOrHasConfigMinRole("min_role_edit_views"),
   error_catcher(async (req, res) => {
     const tables = await Table.find_with_external();
     const tableOptions = tables.map((t) => t.name);
@@ -671,7 +672,7 @@ const respondWorkflow = (view, wf, wfres, req, res, table) => {
  */
 router.get(
   "/config/:name",
-  isAdmin,
+  isAdminOrHasConfigMinRole("min_role_edit_views"),
   error_catcher(async (req, res) => {
     req.socket.on("close", () => {
       File.destroyDirCache();
@@ -719,7 +720,7 @@ router.get(
  */
 router.post(
   "/config/:name",
-  isAdmin,
+  isAdminOrHasConfigMinRole("min_role_edit_views"),
   setTenant,
   error_catcher(async (req, res) => {
     const { name } = req.params;
@@ -760,7 +761,7 @@ router.post(
  */
 router.post(
   "/add-to-menu/:viewname",
-  isAdmin,
+  isAdminOrHasConfigMinRole("min_role_edit_views"),
   error_catcher(async (req, res) => {
     const { viewname } = req.params;
     const view = await View.findOne({ name: viewname });
@@ -795,7 +796,7 @@ router.post(
  */
 router.post(
   "/clone/:id",
-  isAdmin,
+  isAdminOrHasConfigMinRole("min_role_edit_views"),
   error_catcher(async (req, res) => {
     const { id } = req.params;
     const view = await View.findOne({ id });
@@ -825,7 +826,7 @@ router.post(
  */
 router.post(
   "/delete/:id",
-  isAdmin,
+  isAdminOrHasConfigMinRole("min_role_edit_views"),
   error_catcher(async (req, res) => {
     const { id } = req.params;
     await View.delete({ id });
@@ -847,7 +848,7 @@ router.post(
  */
 router.post(
   "/savebuilder/:id",
-  isAdmin,
+  isAdminOrHasConfigMinRole("min_role_edit_views"),
   error_catcher(async (req, res) => {
     const { id } = req.params;
 
@@ -874,7 +875,7 @@ router.post(
  */
 router.post(
   "/saveconfig/:viewname",
-  isAdmin,
+  isAdminOrHasConfigMinRole("min_role_edit_views"),
   setTenant,
   error_catcher(async (req, res) => {
     const { viewname } = req.params;
@@ -922,7 +923,7 @@ router.post(
  */
 router.post(
   "/setrole/:id",
-  isAdmin,
+  isAdminOrHasConfigMinRole("min_role_edit_views"),
   error_catcher(async (req, res) => {
     const { id } = req.params;
     const role = req.body.role;
@@ -952,7 +953,7 @@ router.post(
 
 router.post(
   "/test/inserter",
-  isAdmin,
+  isAdminOrHasConfigMinRole("min_role_edit_views"),
   error_catcher(async (req, res) => {
     const view = await View.create(req.body);
     res.json({ view });

package/serve.js

@@ -50,7 +50,9 @@ const {
 } = require("@saltcorn/admin-models/models/tenant");
 const { auto_backup_now } = require("@saltcorn/admin-models/models/backup");
 const Snapshot = require("@saltcorn/admin-models/models/snapshot");
-const { writeFileSync } = require("fs");
+const { writeFileSync, rmdirSync, readFileSync } = require("fs");
+const { pathExistsSync } = require("fs-extra");
+const envPaths = require("env-paths");
 
 const take_snapshot = async () => {
   return await Snapshot.take_if_changed();
@@ -88,6 +90,54 @@ const ensureEnginesCache = async () => {
   }
 };
 
+/**
+ * validate all plugins folders and remove invalid entries
+ * A folder is invalid when it has dependencies but not node_modules directory
+ */
+const ensurePluginsFolder = async () => {
+  const rootFolder = envPaths("saltcorn", { suffix: "plugins" }).data;
+  const staticDeps = ["@saltcorn/markup", "@saltcorn/data", "jest"];
+  const allPluginFolders = new Set();
+  await eachTenant(async () => {
+    const allPlugins = (await Plugin.find()).filter(
+      (p) => !["base", "sbadmin2"].includes(p.name)
+    );
+    for (const plugin of allPlugins) {
+      const tokens =
+        plugin.source === "npm"
+          ? plugin.location.split("/")
+          : plugin.name.split("/");
+      const pluginDir = path.join(
+        rootFolder,
+        plugin.source === "git" ? "git_plugins" : "plugins_folder",
+        ...tokens
+      );
+      allPluginFolders.add(pluginDir);
+    }
+  });
+  for (const folder of allPluginFolders) {
+    try {
+      if (pathExistsSync(folder)) {
+        const packageJson = JSON.parse(
+          readFileSync(path.join(folder, "package.json"))
+        );
+        if (
+          (Object.keys(packageJson.dependencies || {}).some(
+            (d) => !staticDeps.includes(d)
+          ) ||
+            Object.keys(packageJson.devDependencies || {}).some(
+              (d) => !staticDeps.includes(d)
+            )) &&
+          !pathExistsSync(path.join(folder, "node_modules"))
+        )
+          rmdirSync(folder, { recursive: true });
+      }
+    } catch (e) {
+      console.log(`Error checking plugin folder: ${e.message || e}`);
+    }
+  }
+};
+
 // helpful https://gist.github.com/jpoehls/2232358
 /**
  * @param {object} opts
@@ -236,6 +286,7 @@ module.exports =
     if (cluster.isMaster) {
       ensureJwtSecret();
       await ensureEnginesCache();
+      await ensurePluginsFolder();
     }
     process.on("unhandledRejection", (reason, p) => {
       console.error(reason, "Unhandled Rejection at Promise");

package/tests/api.test.js

@@ -512,8 +512,6 @@ describe("API action", () => {
 
 describe("test share handler", () => {
   beforeAll(async () => {
-    await getState().setConfig("pwa_share_to_enabled", true);
-
     const sharedData = await Table.create("shared_data");
     await Field.create({
       table: sharedData,
@@ -562,22 +560,6 @@ describe("test share handler", () => {
     expect(row).toBeDefined();
   });
 
-  it("pwa_disabled as admin", async () => {
-    const app = await getApp({ disableCsrf: true });
-    const loginCookie = await getAdminLoginCookie();
-    await getState().setConfig("pwa_share_to_enabled", false);
-    await request(app)
-      .post("/notifications/share-handler")
-      .set("Cookie", loginCookie)
-      .send({ title: "pwa_disabled_as_admin" })
-      .expect(toRedirect("/"));
-    await sleep(1000);
-    const sharedData = Table.findOne({ name: "shared_data" });
-    const rows = await sharedData.getRows({});
-    const row = rows.find((r) => r.title === "pwa_disabled_as_admin");
-    expect(row).toBeUndefined();
-  });
-
   it("does not share as public", async () => {
     const app = await getApp({ disableCsrf: true });
     await request(app)

package/tests/plugins.test.js

@@ -92,7 +92,7 @@ describe("Plugin Endpoints", () => {
       .expect(toInclude("testfilecontents"));
     await request(app)
       .get(
-        "/plugins/pubdeps/sbadmin2/startbootstrap-sb-admin-2-bs5/4.1.5-beta.4/css/sb-admin-2.min.css"
+        "/plugins/public/sbadmin2@9.9.9/sb-admin-2.min.css"
       )
       .expect(toInclude("Start Bootstrap"));
 
@@ -102,7 +102,7 @@ describe("Plugin Endpoints", () => {
       .expect(toRedirect("/plugins"));
     await request(app)
       .get(
-        "/plugins/pubdeps/sbadmin2/startbootstrap-sb-admin-2-bs5/4.1.5-beta.4/css/sb-admin-2.min.css"
+        "/plugins/public/sbadmin2@9.9.9/sb-admin-2.min.css"
       )
       .expect(toInclude("Start Bootstrap"));
   });

package/wrapper.js

@@ -89,52 +89,90 @@ const get_menu = (req) => {
       ];
   // const schema = db.getTenantSchema();
   // Admin role id (todo move to common constants)
+
+  const canEditTables = state.getConfig("min_role_edit_tables", 1) >= role;
+  const canInspectTables =
+    state.getConfig("min_role_inspect_tables", 1) >= role;
+  const canEditViews = state.getConfig("min_role_edit_views", 1) >= role;
+  const canEditPages = state.getConfig("min_role_edit_pages", 1) >= role;
+  const canEditTriggers = state.getConfig("min_role_edit_triggers", 1) >= role;
   const isAdmin = role === 1;
+  const hasAdmin =
+    isAdmin ||
+    canEditTables ||
+    canInspectTables ||
+    canEditPages ||
+    canEditViews ||
+    canEditTriggers;
   /*
    * Admin Menu items
    *
    */
-  const adminItems = [
-    { link: "/table", icon: "fas fa-table", label: req.__("Tables") },
-    { link: "/viewedit", icon: "far fa-eye", label: req.__("Views") },
-    { link: "/pageedit", icon: "far fa-file", label: req.__("Pages") },
-    {
-      label: req.__("Settings"),
-      icon: "fas fa-wrench",
-      subitems: [
-        {
-          link: "/admin",
-          icon: "fas fa-tools",
-          label: req.__("About application"),
-        },
-        { link: "/plugins", icon: "fas fa-cubes", label: req.__("Modules") },
-        {
-          link: "/useradmin",
-          icon: "fas fa-users-cog",
-          altlinks: ["/roleadmin"],
-          label: req.__("Users and security"),
-        },
-        {
-          link: "/site-structure",
-          altlinks: [
-            "/menu",
-            "/search/config",
-            "/library/list",
-            "/tenant/list",
-          ],
-          icon: "fas fa-compass",
-          label: req.__("Site structure"),
-        },
-        { link: "/files", icon: "far fa-images", label: req.__("Files") },
-        {
-          link: "/events",
-          altlinks: ["/actions", "/eventlog", "/crashlog"],
-          icon: "fas fa-calendar-check",
-          label: req.__("Events"),
-        },
-      ],
-    },
-  ];
+  const adminItems = [];
+  if (hasAdmin) {
+    if (isAdmin || canInspectTables || canEditTables)
+      adminItems.push({
+        link: "/table",
+        icon: "fas fa-table",
+        label: req.__("Tables"),
+      });
+    if (isAdmin || canEditViews)
+      adminItems.push({
+        link: "/viewedit",
+        icon: "far fa-eye",
+        label: req.__("Views"),
+      });
+    if (isAdmin || canEditPages)
+      adminItems.push({
+        link: "/pageedit",
+        icon: "far fa-file",
+        label: req.__("Pages"),
+      });
+    if (canEditTriggers && !isAdmin)
+      adminItems.push({
+        link: "/actions",
+        altlinks: ["/events", "/eventlog", "/crashlog"],
+        icon: "fas fa-calendar-check",
+        label: req.__("Triggers"),
+      });
+    if (isAdmin)
+      adminItems.push({
+        label: req.__("Settings"),
+        icon: "fas fa-wrench",
+        subitems: [
+          {
+            link: "/admin",
+            icon: "fas fa-tools",
+            label: req.__("About application"),
+          },
+          { link: "/plugins", icon: "fas fa-cubes", label: req.__("Modules") },
+          {
+            link: "/useradmin",
+            icon: "fas fa-users-cog",
+            altlinks: ["/roleadmin"],
+            label: req.__("Users and security"),
+          },
+          {
+            link: "/site-structure",
+            altlinks: [
+              "/menu",
+              "/search/config",
+              "/library/list",
+              "/tenant/list",
+            ],
+            icon: "fas fa-compass",
+            label: req.__("Site structure"),
+          },
+          { link: "/files", icon: "far fa-images", label: req.__("Files") },
+          {
+            link: "/events",
+            altlinks: ["/actions", "/eventlog", "/crashlog"],
+            icon: "fas fa-calendar-check",
+            label: req.__("Events"),
+          },
+        ],
+      });
+  }
 
   // return menu
   return [
@@ -142,7 +180,7 @@ const get_menu = (req) => {
       section: req.__("Menu"),
       items: extra_menu,
     },
-    isAdmin && {
+    hasAdmin && {
       section: req.__("Admin"),
       items: adminItems,
     },