@saltcorn/server 0.6.2-beta.1 → 0.6.2-beta.2

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.6.2-beta.1",
+  "version": "0.6.2-beta.2",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@saltcorn/base-plugin": "0.6.2-beta.1",
-    "@saltcorn/builder": "0.6.2-beta.1",
-    "@saltcorn/data": "0.6.2-beta.1",
+    "@saltcorn/base-plugin": "0.6.2-beta.2",
+    "@saltcorn/builder": "0.6.2-beta.2",
+    "@saltcorn/data": "0.6.2-beta.2",
     "greenlock-express": "^4.0.3",
-    "@saltcorn/markup": "0.6.2-beta.1",
-    "@saltcorn/sbadmin2": "0.6.2-beta.1",
+    "@saltcorn/markup": "0.6.2-beta.2",
+    "@saltcorn/sbadmin2": "0.6.2-beta.2",
     "@socket.io/cluster-adapter": "^0.1.0",
     "@socket.io/sticky": "^1.0.1",
     "connect-flash": "^0.1.1",
@@ -40,7 +40,12 @@
     "pg": "^8.2.1",
     "pluralize": "^8.0.0",
     "socket.io": "4.2.0",
-    "tmp-promise": "^3.0.2"
+    "tmp-promise": "^3.0.2",
+    "multer-s3": "^2.10.0",
+    "multer": "^1.4.3",
+    "aws-sdk": "^2.1037.0",
+    "uuid": "^8.2.0",
+    "content-disposition": "^0.5.3"
   },
   "optionalDependencies": {
     "sd-notify": "^2.8.0"
@@ -67,7 +72,9 @@
       "/plugin_packages/"
     ],
     "moduleNameMapper": {
-      "@saltcorn/sqlite/(.*)": "@saltcorn/sqlite/dist/$1"
+      "@saltcorn/sqlite/(.*)": "@saltcorn/sqlite/dist/$1",
+      "@saltcorn/db-common/(.*)": "@saltcorn/db-common/dist/$1",
+      "@saltcorn/data/(.*)": "@saltcorn/data/dist/$1"
     }
   },
   "publishConfig": {

package/public/saltcorn.css

@@ -65,11 +65,11 @@ div.testrunoutput code {
 }
 
 div[data-inline-edit-dest-url] .editicon {
-  display: none;
+  visibility: hidden;
 }
 
 div[data-inline-edit-dest-url]:hover .editicon {
-  display: inline;
+  visibility: visible;
 }
 .searchbar-dropdown {
   left: unset;

package/restart_watcher.js

@@ -7,6 +7,8 @@ const path = require("path");
 const { spawnSync } = require("child_process");
 const watch = require("node-watch");
 const Plugin = require("@saltcorn/data/models/plugin");
+const db = require("@saltcorn/data/db");
+const { eachTenant } = require("@saltcorn/data/models/tenant");
 
 /**
  * packages that should trigger a server re-start
@@ -63,8 +65,15 @@ const getRelevantPackages = () => {
  * @returns {string[]} list of paths to relevant directories
  */
 const getPluginDirectories = async () => {
-  const local_plugins = await Plugin.find({ source: "local" });
-  return local_plugins.map((p) => p.location);
+  const getDirs = async () => {
+    const local_plugins = await Plugin.find({ source: "local" });
+    return local_plugins.map((p) => p.location);
+  };
+  const listOfDirs = [];
+  await eachTenant(async () => {
+    listOfDirs.push(await getDirs());
+  });
+  return [...new Set(listOfDirs.flat(1))];
 };
 
 const projectRoot = getProjectRoot();

package/routes/actions.js

@@ -5,12 +5,7 @@
  * @subcategory routes
  */
 const Router = require("express-promise-router");
-const {
-  isAdmin,
-  setTenant,
-  error_catcher,
-  get_base_url,
-} = require("./utils.js");
+const { isAdmin, error_catcher, get_base_url } = require("./utils.js");
 const { getState } = require("@saltcorn/data/db/state");
 const Trigger = require("@saltcorn/data/models/trigger");
 
@@ -87,7 +82,6 @@ const getActions = async () => {
  */
 router.get(
   "/",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const triggers = await Trigger.findAllWithTableName();
@@ -288,7 +282,6 @@ const triggerForm = async (req, trigger) => {
  */
 router.get(
   "/new",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const form = await triggerForm(req);
@@ -314,7 +307,6 @@ router.get(
  */
 router.get(
   "/edit/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -344,7 +336,6 @@ router.get(
  */
 router.post(
   "/new",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const form = await triggerForm(req);
@@ -384,7 +375,6 @@ router.post(
  */
 router.post(
   "/edit/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -427,7 +417,6 @@ router.post(
  */
 router.get(
   "/configure/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -543,7 +532,6 @@ router.get(
  */
 router.post(
   "/configure/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -585,7 +573,6 @@ router.post(
  */
 router.post(
   "/delete/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -602,7 +589,6 @@ router.post(
  */
 router.get(
   "/testrun/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;

package/routes/admin.js

@@ -5,12 +5,7 @@
  */
 const Router = require("express-promise-router");
 
-const {
-  setTenant,
-  isAdmin,
-  error_catcher,
-  getGitRevision,
-} = require("./utils.js");
+const { isAdmin, error_catcher, getGitRevision } = require("./utils.js");
 const Table = require("@saltcorn/data/models/table");
 const Plugin = require("@saltcorn/data/models/plugin");
 const File = require("@saltcorn/data/models/file");
@@ -52,6 +47,7 @@ const load_plugins = require("../load_plugins");
 const {
   restore_backup,
   send_admin_page,
+  send_files_page,
   config_fields_form,
   save_config_from_form,
   flash_restart_if_required,
@@ -66,6 +62,7 @@ const {
   is_hsts_tld,
 } = require("../markup/admin");
 const moment = require("moment");
+const View = require("@saltcorn/data/models/view");
 
 /**
  * @type {object}
@@ -78,7 +75,7 @@ const router = new Router();
 module.exports = router;
 
 /**
- * @param {object} req 
+ * @param {object} req
  * @returns {Promise<Form>}
  */
 const site_id_form = (req) =>
@@ -131,7 +128,6 @@ const email_form = async (req) => {
  */
 router.get(
   "/",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const isRoot = db.getTenantSchema() === db.connectObj.default_schema;
@@ -156,7 +152,6 @@ router.get(
  */
 router.post(
   "/",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const form = await site_id_form(req);
@@ -189,7 +184,6 @@ router.post(
  */
 router.get(
   "/email",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const form = await email_form(req);
@@ -223,7 +217,6 @@ router.get(
  */
 router.get(
   "/send-test-email",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const from = getState().getConfig("email_from");
@@ -254,7 +247,6 @@ router.get(
  */
 router.post(
   "/email",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const form = await email_form(req);
@@ -285,7 +277,6 @@ router.post(
  */
 router.get(
   "/backup",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     send_admin_page({
@@ -330,7 +321,6 @@ router.get(
  */
 router.get(
   "/system",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const isRoot = db.getTenantSchema() === db.connectObj.default_schema;
@@ -450,7 +440,6 @@ router.get(
  */
 router.post(
   "/restart",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     if (db.getTenantSchema() === db.connectObj.default_schema) {
@@ -473,7 +462,6 @@ router.post(
  */
 router.post(
   "/upgrade",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     if (db.getTenantSchema() !== db.connectObj.default_schema) {
@@ -510,7 +498,6 @@ router.post(
  */
 router.post(
   "/backup",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const fileName = await create_backup();
@@ -531,7 +518,6 @@ router.post(
  */
 router.post(
   "/restore",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const newPath = File.get_new_path();
@@ -547,7 +533,7 @@ router.post(
 );
 
 /**
- * @param {object} req 
+ * @param {object} req
  * @returns {Form}
  */
 const clearAllForm = (req) =>
@@ -628,7 +614,6 @@ const clearAllForm = (req) =>
  */
 router.post(
   "/enable-letsencrypt",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     if (db.getTenantSchema() === db.connectObj.default_schema) {
@@ -706,7 +691,6 @@ router.post(
  */
 router.get(
   "/clear-all",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     res.sendWrap(req.__(`Admin`), {
@@ -736,7 +720,6 @@ router.get(
  */
 router.post(
   "/clear-all",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const form = clearAllForm(req);
@@ -746,7 +729,7 @@ router.post(
       await db.deleteWhere("_sc_pages");
     }
     if (form.values.views) {
-      await db.deleteWhere("_sc_views");
+      await View.delete({});
     }
     //user fields
     const users = await Table.findOne({ name: "users" });

package/routes/api.js

@@ -16,7 +16,7 @@
 /** @type {module:express-promise-router} */
 const Router = require("express-promise-router");
 //const db = require("@saltcorn/data/db");
-const { setTenant, error_catcher } = require("./utils.js");
+const { error_catcher } = require("./utils.js");
 //const { mkTable, renderForm, link, post_btn } = require("@saltcorn/markup");
 const { getState } = require("@saltcorn/data/db/state");
 const Table = require("@saltcorn/data/models/table");
@@ -41,7 +41,7 @@ const router = new Router();
 module.exports = router;
 
 /**
- * @param {*} fields 
+ * @param {*} fields
  * @returns {*}
  */
 const limitFields = (fields) => (r) => {
@@ -64,14 +64,14 @@ const limitFields = (fields) => (r) => {
  * @param {Table} table
  * @returns {boolean}
  */
-function accessAllowedRead(req, user, table){
-    const role = req.isAuthenticated()
-        ? req.user.role_id
-        : user && user.role_id
-            ? user.role_id
-            : 10;
+function accessAllowedRead(req, user, table) {
+  const role = req.isAuthenticated()
+    ? req.user.role_id
+    : user && user.role_id
+    ? user.role_id
+    : 10;
 
-    return role <= table.min_role_read;
+  return role <= table.min_role_read;
 }
 
 /**
@@ -81,15 +81,14 @@ function accessAllowedRead(req, user, table){
  * @param {Table} table
  * @returns {boolean}
  */
-function accessAllowedWrite(req, user, table){
-    const role = req.isAuthenticated()
-        ? req.user.role_id
-        : user && user.role_id
-            ? user.role_id
-            : 10;
-
-    return role <= table.min_role_write;
+function accessAllowedWrite(req, user, table) {
+  const role = req.isAuthenticated()
+    ? req.user.role_id
+    : user && user.role_id
+    ? user.role_id
+    : 10;
 
+  return role <= table.min_role_write;
 }
 /**
  * Check that user has right to trigger call
@@ -98,14 +97,14 @@ function accessAllowedWrite(req, user, table){
  * @param {Trigger} trigger
  * @returns {boolean}
  */
-function accessAllowed(req, user, trigger){
-    const role = req.isAuthenticated()
-        ? req.user.role_id
-        : user && user.role_id
-            ? user.role_id
-            : 10;
+function accessAllowed(req, user, trigger) {
+  const role = req.isAuthenticated()
+    ? req.user.role_id
+    : user && user.role_id
+    ? user.role_id
+    : 10;
 
-    return role <= trigger.min_role;
+  return role <= trigger.min_role;
 }
 
 /**
@@ -117,7 +116,6 @@ function accessAllowed(req, user, trigger){
 // todo add paging
 router.get(
   "/:tableName/",
-  setTenant,
   //passport.authenticate("api-bearer", { session: false }),
   error_catcher(async (req, res, next) => {
     const { tableName } = req.params;
@@ -176,7 +174,6 @@ router.get(
  */
 router.post(
   "/action/:actionname/",
-  setTenant,
   error_catcher(async (req, res, next) => {
     const { actionname } = req.params;
     // todo protect action by authorization check
@@ -189,30 +186,30 @@ router.post(
       when_trigger: "API call",
     });
 
-    if (!trigger){
-        res.status(400).json({ error: req.__("Not found") });
-        return;
+    if (!trigger) {
+      res.status(400).json({ error: req.__("Not found") });
+      return;
     }
     await passport.authenticate(
-        "api-bearer",
-        { session: false },
-        async function (err, user, info) {
-            if (accessAllowed(req, user, trigger)) {
-                try {
-                    const action = getState().actions[trigger.action];
-                    const resp = await action.run({
-                        configuration: trigger.configuration,
-                        body: req.body,
-                        req,
-                    });
-                    res.json({success: true, data: resp});
-                } catch (e) {
-                    res.status(400).json({success: false, error: e.message});
-                }
-            } else {
-              res.status(401).json({ error: req.__("Not authorized") });
-            }
+      "api-bearer",
+      { session: false },
+      async function (err, user, info) {
+        if (accessAllowed(req, user, trigger)) {
+          try {
+            const action = getState().actions[trigger.action];
+            const resp = await action.run({
+              configuration: trigger.configuration,
+              body: req.body,
+              req,
+            });
+            res.json({ success: true, data: resp });
+          } catch (e) {
+            res.status(400).json({ success: false, error: e.message });
+          }
+        } else {
+          res.status(401).json({ error: req.__("Not authorized") });
         }
+      }
     )(req, res, next);
   })
 );
@@ -225,7 +222,6 @@ router.post(
  */
 router.post(
   "/:tableName/",
-  setTenant,
   error_catcher(async (req, res, next) => {
     const { tableName } = req.params;
     const table = await Table.findOne({ name: tableName });
@@ -294,7 +290,6 @@ router.post(
  */
 router.post(
   "/:tableName/:id",
-  setTenant,
   error_catcher(async (req, res, next) => {
     const { tableName, id } = req.params;
     const table = await Table.findOne({ name: tableName });
@@ -355,7 +350,6 @@ router.post(
 router.delete(
   "/:tableName/:id",
   // in case of primary key different from id - id will be string "undefined"
-  setTenant,
   error_catcher(async (req, res, next) => {
     const { tableName, id } = req.params;
     const table = await Table.findOne({ name: tableName });
@@ -368,17 +362,14 @@ router.delete(
       { session: false },
       async function (err, user, info) {
         if (accessAllowedWrite(req, user, table)) {
-
           try {
-            if(id === "undefined"){
-                const pk_name = table.pk_name;
-                //const fields = await table.getFields();
-                const row = req.body;
-                //readState(row, fields);
-                await table.deleteRows({  [pk_name]:  row[pk_name]} );
-            }
-            else
-                await table.deleteRows({ id });
+            if (id === "undefined") {
+              const pk_name = table.pk_name;
+              //const fields = await table.getFields();
+              const row = req.body;
+              //readState(row, fields);
+              await table.deleteRows({ [pk_name]: row[pk_name] });
+            } else await table.deleteRows({ id });
             res.json({ success: true });
           } catch (e) {
             res.status(400).json({ error: e.message });

package/routes/config.js

@@ -48,7 +48,6 @@ module.exports = router;
  */
 router.post(
   "/delete/:key",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { key } = req.params;

package/routes/crashlog.js

@@ -20,7 +20,7 @@ const {
   p,
 } = require("@saltcorn/markup/tags");
 
-const { setTenant, isAdmin, error_catcher } = require("./utils.js");
+const { isAdmin, error_catcher } = require("./utils.js");
 const { send_events_page } = require("../markup/admin.js");
 
 /**
@@ -41,7 +41,6 @@ module.exports = router;
  */
 router.get(
   "/",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const state = req.query,
@@ -103,7 +102,6 @@ router.get(
  */
 router.post(
   "/",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const err = {
@@ -123,7 +121,6 @@ router.post(
  */
 router.get(
   "/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;

package/routes/delete.js

@@ -6,7 +6,7 @@
 
 const Router = require("express-promise-router");
 
-const { setTenant, loggedIn, error_catcher } = require("./utils.js");
+const { loggedIn, error_catcher } = require("./utils.js");
 const Table = require("@saltcorn/data/models/table");
 
 /**
@@ -29,7 +29,6 @@ module.exports = router;
  */
 router.post(
   "/:name/:id",
-  setTenant,
   error_catcher(async (req, res) => {
     const { name, id } = req.params;
     const { redirect } = req.query;

package/routes/edit.js

@@ -9,7 +9,7 @@ const Router = require("express-promise-router");
 const Field = require("@saltcorn/data/models/field");
 const File = require("@saltcorn/data/models/file");
 const Form = require("@saltcorn/data/models/form");
-const { setTenant, loggedIn, error_catcher } = require("./utils.js");
+const { loggedIn, error_catcher } = require("./utils.js");
 const Table = require("@saltcorn/data/models/table");
 const pluralize = require("pluralize");
 
@@ -33,7 +33,6 @@ module.exports = router;
  */
 router.post(
   "/toggle/:name/:id/:field_name",
-  setTenant,
   error_catcher(async (req, res) => {
     const { name, id, field_name } = req.params;
     const { redirect } = req.query;

package/routes/eventlog.js

@@ -5,12 +5,7 @@
  * @subcategory routes
  */
 const Router = require("express-promise-router");
-const {
-  isAdmin,
-  setTenant,
-  error_catcher,
-  get_base_url,
-} = require("./utils.js");
+const { isAdmin, error_catcher, get_base_url } = require("./utils.js");
 const { getState } = require("@saltcorn/data/db/state");
 const Trigger = require("@saltcorn/data/models/trigger");
 
@@ -52,7 +47,7 @@ const { send_events_page } = require("../markup/admin.js");
 const EventLog = require("@saltcorn/data/models/eventlog");
 
 /**
- * @param {object} req 
+ * @param {object} req
  * @returns {Promise<Form>}
  */
 const logSettingsForm = async (req) => {
@@ -101,7 +96,6 @@ const logSettingsForm = async (req) => {
  */
 router.get(
   "/settings",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const form = await logSettingsForm(req);
@@ -128,7 +122,6 @@ router.get(
  */
 router.get(
   "/custom",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const cevs = getState().getConfig("custom_events", []);
@@ -202,7 +195,6 @@ const customEventForm = () =>
  */
 router.get(
   "/custom/new",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const form = customEventForm();
@@ -228,7 +220,6 @@ router.get(
  */
 router.post(
   "/custom/new",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const form = customEventForm();
@@ -264,7 +255,6 @@ router.post(
  */
 router.post(
   "/custom/delete/:name",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { name } = req.params;
@@ -288,7 +278,6 @@ router.post(
  */
 router.post(
   "/settings",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const form = await logSettingsForm(req);
@@ -321,7 +310,6 @@ router.post(
  */
 router.get(
   "/",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const state = req.query,
@@ -377,7 +365,6 @@ router.get(
  */
 router.get(
   "/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;