@saltcorn/server 0.6.2-beta.0 → 0.6.2-beta.4

package/routes/search.js

@@ -8,7 +8,7 @@ const Router = require("express-promise-router");
 const { span, h5, h4, nbsp, p, a, div } = require("@saltcorn/markup/tags");
 
 const { getState } = require("@saltcorn/data/db/state");
-const { setTenant, isAdmin, error_catcher } = require("./utils.js");
+const { isAdmin, error_catcher } = require("./utils.js");
 const Form = require("@saltcorn/data/models/form");
 const Table = require("@saltcorn/data/models/table");
 const View = require("@saltcorn/data/models/view");
@@ -27,9 +27,9 @@ const router = new Router();
 module.exports = router;
 
 /**
- * @param {object[]} tables 
- * @param {object[]} views 
- * @param {object} req 
+ * @param {object[]} tables
+ * @param {object[]} views
+ * @param {object} req
  * @returns {Forms}
  */
 const searchConfigForm = (tables, views, req) => {
@@ -75,7 +75,6 @@ const searchConfigForm = (tables, views, req) => {
  */
 router.get(
   "/config",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     var views = await View.find({}, { orderBy: "name" });
@@ -95,7 +94,6 @@ router.get(
   })
 );
 
-
 /**
  * @name post/config
  * @function
@@ -104,7 +102,6 @@ router.get(
  */
 router.post(
   "/config",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     var views = await View.find({}, { orderBy: "name" });
@@ -154,8 +151,8 @@ const searchForm = () =>
  * @param {*} opts._page
  * @param {*} opts.table
  * @param {object} opts
- * @param {object} req 
- * @param {object} res 
+ * @param {object} req
+ * @param {object} res
  * @returns {Promise<void>}
  */
 const runSearch = async ({ q, _page, table }, req, res) => {
@@ -253,7 +250,6 @@ const runSearch = async ({ q, _page, table }, req, res) => {
  */
 router.get(
   "/",
-  setTenant,
   error_catcher(async (req, res) => {
     if (req.query && req.query.q) {
       await runSearch(req.query, req, res);

package/routes/settings.js

@@ -6,7 +6,7 @@
 
 const Router = require("express-promise-router");
 const { i, h3, p, a } = require("@saltcorn/markup/tags");
-const { setTenant, isAdmin, error_catcher } = require("./utils.js");
+const { isAdmin, error_catcher } = require("./utils.js");
 
 /**
  * @type {object}
@@ -46,7 +46,6 @@ const settingsCard = ({ title, icon, blurb, href }) => ({
  */
 router.get(
   "/",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     res.sendWrap(req.__("Settings"), {

package/routes/tables.js

@@ -22,7 +22,7 @@ const {
   post_dropdown_item,
 } = require("@saltcorn/markup");
 const { recalculate_for_stored } = require("@saltcorn/data/models/expression");
-const { setTenant, isAdmin, error_catcher } = require("./utils.js");
+const { isAdmin, error_catcher } = require("./utils.js");
 const Form = require("@saltcorn/data/models/form");
 const {
   span,
@@ -171,7 +171,6 @@ const tableForm = async (table, req) => {
  */
 router.get(
   "/new/",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     res.sendWrap(req.__(`New table`), {
@@ -241,7 +240,6 @@ const discoverForm = (tables, req) => {
  */
 router.get(
   "/discover",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     // get list of discoverable tables
@@ -276,7 +274,6 @@ router.get(
  */
 router.post(
   "/discover",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const tbls = await discoverable_tables();
@@ -304,7 +301,6 @@ router.post(
  */
 router.get(
   "/create-from-csv",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     res.sendWrap(req.__(`Create table from CSV file`), {
@@ -356,7 +352,6 @@ router.get(
  */
 router.post(
   "/create-from-csv",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     if (req.body.name && req.files && req.files.file) {
@@ -405,7 +400,6 @@ router.post(
  */
 router.get(
   "/relationship-diagram",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const tables = await Table.find_with_external({}, { orderBy: "name" });
@@ -535,7 +529,6 @@ const attribBadges = (f) => {
  */
 router.get(
   "/:idorname",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { idorname } = req.params;
@@ -843,7 +836,6 @@ router.get(
  */
 router.post(
   "/",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const v = req.body;
@@ -918,7 +910,6 @@ router.post(
  */
 router.post(
   "/delete/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -945,7 +936,6 @@ router.post(
 );
 router.post(
   "/forget-table/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -1000,7 +990,6 @@ const tableBadges = (t, req) => {
  */
 router.get(
   "/",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const rows = await Table.find_with_external({}, { orderBy: "name" });
@@ -1095,7 +1084,6 @@ router.get(
  */
 router.get(
   "/download/:name",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { name } = req.params;
@@ -1125,7 +1113,6 @@ router.get(
  */
 router.get(
   "/constraints/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -1203,7 +1190,6 @@ const constraintForm = (req, table_id, fields) =>
  */
 router.get(
   "/add-constraint/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -1248,7 +1234,6 @@ router.get(
  */
 router.post(
   "/add-constraint/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -1303,7 +1288,6 @@ const renameForm = (table_id, req) =>
  */
 router.get(
   "/rename/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -1341,7 +1325,6 @@ router.get(
  */
 router.post(
   "/rename/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -1366,7 +1349,6 @@ router.post(
  */
 router.post(
   "/delete-constraint/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -1385,7 +1367,6 @@ router.post(
  */
 router.post(
   "/upload_to_table/:name",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { name } = req.params;
@@ -1421,7 +1402,6 @@ router.post(
  */
 router.post(
   "/delete-all-rows/:name",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { name } = req.params;
@@ -1447,7 +1427,6 @@ router.post(
  */
 router.post(
   "/recalc-stored/:name",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { name } = req.params;

package/routes/tenant.js

@@ -35,7 +35,7 @@ const {
 const db = require("@saltcorn/data/db");
 const url = require("url");
 const { loadAllPlugins, loadAndSaveNewPlugin } = require("../load_plugins");
-const { setTenant, isAdmin, error_catcher } = require("./utils.js");
+const { isAdmin, error_catcher } = require("./utils.js");
 const User = require("@saltcorn/data/models/user");
 const File = require("@saltcorn/data/models/file");
 const {
@@ -115,7 +115,6 @@ const is_ip_address = (hostname) => {
  */
 router.get(
   "/create",
-  setTenant,
   error_catcher(async (req, res) => {
     if (
       !db.is_it_multi_tenant() ||
@@ -207,7 +206,6 @@ const getNewURL = (req, subdomain) => {
  */
 router.post(
   "/create",
-  setTenant,
   error_catcher(async (req, res) => {
     // check that multi-tenancy is enabled
     if (
@@ -306,7 +304,6 @@ router.post(
  */
 router.get(
   "/list",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     if (
@@ -390,7 +387,6 @@ const tenant_settings_form = (req) =>
  */
 router.get(
   "/settings",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     if (
@@ -425,7 +421,6 @@ router.get(
  */
 router.post(
   "/settings",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const form = await tenant_settings_form(req);
@@ -502,7 +497,6 @@ const get_tenant_info = async (subdomain) => {
  */
 router.get(
   "/info/:subdomain",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     if (
@@ -648,7 +642,6 @@ router.get(
  */
 router.post(
   "/info/:subdomain",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     if (
@@ -680,7 +673,6 @@ router.post(
  */
 router.post(
   "/delete/:sub",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     if (

package/routes/utils.js

@@ -20,9 +20,9 @@ const { validateHeaderName, validateHeaderValue } = require("http");
 const Crash = require("@saltcorn/data/models/crash");
 
 /**
- * @param {object} req 
- * @param {object} res 
- * @param {function} next 
+ * @param {object} req
+ * @param {object} res
+ * @param {function} next
  * @returns {void}
  */
 function loggedIn(req, res, next) {
@@ -35,9 +35,9 @@ function loggedIn(req, res, next) {
 }
 
 /**
- * @param {object} req 
- * @param {object} res 
- * @param {function} next 
+ * @param {object} req
+ * @param {object} res
+ * @param {function} next
  * @returns {void}
  */
 function isAdmin(req, res, next) {
@@ -54,8 +54,8 @@ function isAdmin(req, res, next) {
 }
 
 /**
- * @param {object} req 
- * @param {object} res 
+ * @param {object} req
+ * @param {object} res
  * @param {string} state
  * @returns {void}
  */
@@ -67,8 +67,8 @@ const setLanguage = (req, res, state) => {
 };
 
 /**
- * @param {object} res 
- * @param {string} state 
+ * @param {object} res
+ * @param {string} state
  * @returns {void}
  */
 const set_custom_http_headers = (res, state) => {
@@ -90,7 +90,7 @@ const set_custom_http_headers = (res, state) => {
 };
 
 /**
- * @param {object} req 
+ * @param {object} req
  * @returns {string}
  */
 const get_tenant_from_req = (req) => {
@@ -106,9 +106,9 @@ const get_tenant_from_req = (req) => {
 };
 
 /**
- * @param {object} req 
- * @param {object} res 
- * @param {function} next 
+ * @param {object} req
+ * @param {object} res
+ * @param {function} next
  */
 const setTenant = (req, res, next) => {
   if (db.is_it_multi_tenant()) {
@@ -141,7 +141,7 @@ const setTenant = (req, res, next) => {
 };
 
 /**
- * @param {object} req 
+ * @param {object} req
  * @returns {input}
  */
 const csrfField = (req) =>
@@ -152,7 +152,7 @@ const csrfField = (req) =>
   });
 
 /**
- * @param {function} fn 
+ * @param {function} fn
  * @returns {function}
  */
 const error_catcher = (fn) => (request, response, next) => {
@@ -160,8 +160,8 @@ const error_catcher = (fn) => (request, response, next) => {
 };
 
 /**
- * @param {string|object} contents 
- * @param {string} viewname 
+ * @param {string|object} contents
+ * @param {string} viewname
  * @returns {string}
  */
 const scan_for_page_title = (contents, viewname) => {
@@ -224,10 +224,10 @@ module.exports = {
   csrfField,
   loggedIn,
   isAdmin,
-  setTenant,
   get_base_url,
   error_catcher,
   scan_for_page_title,
   getGitRevision,
   getSessionStore,
+  setTenant,
 };

package/routes/view.js

@@ -13,12 +13,12 @@ const Page = require("@saltcorn/data/models/page");
 const { div, text, i, a } = require("@saltcorn/markup/tags");
 const { renderForm, link } = require("@saltcorn/markup");
 const {
-  setTenant,
   isAdmin,
   error_catcher,
   scan_for_page_title,
 } = require("../routes/utils.js");
 const { add_edit_bar } = require("../markup/admin.js");
+const { InvalidConfiguration } = require("@saltcorn/data/utils");
 
 /**
  * @type {object}
@@ -38,7 +38,6 @@ module.exports = router;
  */
 router.get(
   "/:viewname",
-  setTenant,
   error_catcher(async (req, res) => {
     const { viewname } = req.params;
 
@@ -82,7 +81,6 @@ router.get(
  */
 router.post(
   "/:viewname/preview",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { viewname } = req.params;
@@ -120,7 +118,6 @@ router.post(
  */
 router.post(
   "/:viewname/:route",
-  setTenant,
   error_catcher(async (req, res) => {
     const { viewname, route } = req.params;
     const role = req.isAuthenticated() ? req.user.role_id : 10;
@@ -146,7 +143,6 @@ router.post(
  */
 router.post(
   "/:viewname",
-  setTenant,
   error_catcher(async (req, res) => {
     const { viewname } = req.params;
     const role = req.isAuthenticated() ? req.user.role_id : 10;
@@ -161,6 +157,12 @@ router.post(
     ) {
       req.flash("danger", req.__("Not authorized"));
       res.redirect("/");
+    } else if (!view.runPost) {
+      throw new InvalidConfiguration(
+        `View ${text(viewname)} with template ${
+          view.viewtemplate
+        } does not supply a POST handler`
+      );
     } else {
       await view.runPost(req.query, req.body, { res, req });
     }

package/routes/viewedit.js

@@ -30,7 +30,7 @@ const {
 } = require("@saltcorn/markup/tags");
 
 const { getState } = require("@saltcorn/data/db/state");
-const { setTenant, isAdmin, error_catcher } = require("./utils.js");
+const { isAdmin, error_catcher } = require("./utils.js");
 const Form = require("@saltcorn/data/models/form");
 const Field = require("@saltcorn/data/models/field");
 const Table = require("@saltcorn/data/models/table");
@@ -53,9 +53,9 @@ const router = new Router();
 module.exports = router;
 
 /**
- * @param {object} view 
- * @param {object[]} roles 
- * @param {object} req 
+ * @param {object} view
+ * @param {object[]} roles
+ * @param {object} req
  * @returns {Form}
  */
 const editViewRoleForm = (view, roles, req) =>
@@ -67,8 +67,8 @@ const editViewRoleForm = (view, roles, req) =>
   });
 
 /**
- * @param {object} view 
- * @param {object} req 
+ * @param {object} view
+ * @param {object} req
  * @returns {div}
  */
 const view_dropdown = (view, req) =>
@@ -115,7 +115,6 @@ const view_dropdown = (view, req) =>
  */
 router.get(
   "/",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     var orderBy = "name";
@@ -218,19 +217,19 @@ router.get(
 );
 
 /**
- * @param {object} o 
- * @param {function} f 
+ * @param {object} o
+ * @param {function} f
  * @returns {object}
  */
 const mapObjectValues = (o, f) =>
   Object.fromEntries(Object.entries(o).map(([k, v]) => [k, f(v)]));
 
 /**
- * @param {object} req 
- * @param {object} tableOptions 
- * @param {object[]} roles 
- * @param {object[]} pages 
- * @param {object} values 
+ * @param {object} req
+ * @param {object} tableOptions
+ * @param {object[]} roles
+ * @param {object[]} pages
+ * @param {object} values
  * @returns {Form}
  */
 const viewForm = (req, tableOptions, roles, pages, values) => {
@@ -328,7 +327,6 @@ const viewForm = (req, tableOptions, roles, pages, values) => {
  */
 router.get(
   "/edit/:viewname",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { viewname } = req.params;
@@ -376,7 +374,6 @@ router.get(
  */
 router.get(
   "/new",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const tables = await Table.find_with_external();
@@ -414,7 +411,6 @@ router.get(
  */
 router.post(
   "/save",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const tables = await Table.find_with_external();
@@ -484,11 +480,11 @@ router.post(
 );
 
 /**
- * @param {object} view 
- * @param {Workflow} wf 
- * @param {object} wfres 
- * @param {object} req 
- * @param {object} res 
+ * @param {object} view
+ * @param {Workflow} wf
+ * @param {object} wfres
+ * @param {object} req
+ * @param {object} res
  * @returns {void}
  */
 const respondWorkflow = (view, wf, wfres, req, res) => {
@@ -532,7 +528,6 @@ const respondWorkflow = (view, wf, wfres, req, res) => {
  */
 router.get(
   "/config/:name",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { name } = req.params;
@@ -565,7 +560,6 @@ router.get(
  */
 router.post(
   "/config/:name",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { name } = req.params;
@@ -585,7 +579,6 @@ router.post(
  */
 router.post(
   "/add-to-menu/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -615,7 +608,6 @@ router.post(
  */
 router.post(
   "/clone/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -637,7 +629,6 @@ router.post(
  */
 router.post(
   "/delete/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -655,7 +646,6 @@ router.post(
  */
 router.post(
   "/savebuilder/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -679,7 +669,6 @@ router.post(
  */
 router.post(
   "/setrole/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;