@saltcorn/server 0.6.1-beta.3 → 0.6.2-beta.2

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;

package/routes/events.js

@@ -25,7 +25,6 @@ module.exports = router;
  */
 router.get(
   "/",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     res.redirect(`/actions`);

package/routes/fields.js

@@ -22,7 +22,7 @@ const {
 } = require("@saltcorn/data/models/expression");
 const db = require("@saltcorn/data/db");
 
-const { setTenant, isAdmin, error_catcher } = require("./utils.js");
+const { isAdmin, error_catcher } = require("./utils.js");
 const expressionBlurb = require("../markup/expression_blurb");
 const { readState } = require("@saltcorn/data/plugin-helper");
 const { wizardCardTitle } = require("../markup/forms.js");
@@ -38,11 +38,11 @@ const router = new Router();
 module.exports = router;
 
 /**
- * @param {object} req 
- * @param {*} fkey_opts 
- * @param {*} existing_names 
- * @param {*} id 
- * @param {*} hasData 
+ * @param {object} req
+ * @param {*} fkey_opts
+ * @param {*} existing_names
+ * @param {*} id
+ * @param {*} hasData
  * @returns {Promise<Form>}
  */
 const fieldForm = async (req, fkey_opts, existing_names, id, hasData) => {
@@ -137,7 +137,7 @@ const fieldForm = async (req, fkey_opts, existing_names, id, hasData) => {
 };
 
 /**
- * @param {string} ctxType 
+ * @param {string} ctxType
  * @returns {object}
  */
 const calcFieldType = (ctxType) =>
@@ -146,8 +146,8 @@ const calcFieldType = (ctxType) =>
     : { type: ctxType };
 
 /**
- * @param {*} attrs 
- * @param {object} req 
+ * @param {*} attrs
+ * @param {object} req
  * @returns {*}
  */
 const translateAttributes = (attrs, req) =>
@@ -156,8 +156,8 @@ const translateAttributes = (attrs, req) =>
     : attrs;
 
 /**
- * @param {*} attr 
- * @param {*} req 
+ * @param {*} attr
+ * @param {*} req
  * @returns {object}
  */
 const translateAttribute = (attr, req) => {
@@ -167,7 +167,7 @@ const translateAttribute = (attr, req) => {
 };
 
 /**
- * @param {*} req 
+ * @param {*} req
  * @returns {Workflow}
  */
 const fieldFlow = (req) =>
@@ -419,7 +419,6 @@ const fieldFlow = (req) =>
  */
 router.get(
   "/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -472,7 +471,6 @@ router.get(
  */
 router.get(
   "/new/:table_id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { table_id } = req.params;
@@ -509,7 +507,6 @@ router.get(
  */
 router.post(
   "/delete/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -535,7 +532,6 @@ router.post(
  */
 router.post(
   "/",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const wf = fieldFlow(req);
@@ -584,7 +580,6 @@ router.post(
  */
 router.post(
   "/test-formula",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { formula, tablename, stored } = req.body;
@@ -622,7 +617,6 @@ router.post(
  */
 router.post(
   "/show-calculated/:tableName/:fieldName/:fieldview",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { tableName, fieldName, fieldview } = req.params;
@@ -657,7 +651,6 @@ router.post(
  */
 router.post(
   "/preview/:tableName/:fieldName/:fieldview",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { tableName, fieldName, fieldview } = req.params;
@@ -697,12 +690,12 @@ router.post(
     if (!fv && field.type === "Key" && fieldview === "select")
       res.send("<select disabled></select>");
     else if (!fv) res.send("");
-    else if (fv.isEdit)
+    else if (fv.isEdit || fv.isFilter)
       res.send(
         fv.run(
           field.name,
           undefined,
-          { disabled: true, ...configuration },
+          { disabled: true, ...configuration, ...(field.attributes || {}) },
           "",
           false,
           field
@@ -722,7 +715,6 @@ router.post(
  */
 router.post(
   "/preview/:tableName/:fieldName/",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     res.send("");