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

package/routes/page.js

@@ -10,11 +10,7 @@ const Page = require("@saltcorn/data/models/page");
 const { div, a, i } = require("@saltcorn/markup/tags");
 const { renderForm } = require("@saltcorn/markup");
 const { getState } = require("@saltcorn/data/db/state");
-const {
-  setTenant,
-  error_catcher,
-  scan_for_page_title,
-} = require("../routes/utils.js");
+const { error_catcher, scan_for_page_title } = require("../routes/utils.js");
 const { add_edit_bar } = require("../markup/admin.js");
 const { traverseSync } = require("@saltcorn/data/models/layout");
 const { run_action_column } = require("@saltcorn/data/plugin-helper");
@@ -38,7 +34,6 @@ module.exports = router;
  */
 router.get(
   "/:pagename",
-  setTenant,
   error_catcher(async (req, res) => {
     const { pagename } = req.params;
 
@@ -76,7 +71,6 @@ router.get(
  */
 router.post(
   "/:pagename/action/:rndid",
-  setTenant,
   error_catcher(async (req, res) => {
     const { pagename, rndid } = req.params;
     const role = req.isAuthenticated() ? req.user.role_id : 10;

package/routes/pageedit.js

@@ -20,7 +20,7 @@ const { getViews, traverseSync } = require("@saltcorn/data/models/layout");
 const { add_to_menu } = require("@saltcorn/data/models/pack");
 const db = require("@saltcorn/data/db");
 
-const { setTenant, isAdmin, error_catcher } = require("./utils.js");
+const { isAdmin, error_catcher } = require("./utils.js");
 const {
   mkTable,
   renderForm,
@@ -46,9 +46,9 @@ const router = new Router();
 module.exports = router;
 
 /**
- * @param {object} page 
- * @param {*} roles 
- * @param {object} req 
+ * @param {object} page
+ * @param {*} roles
+ * @param {object} req
  * @returns {Form}
  */
 const editPageRoleForm = (page, roles, req) =>
@@ -60,8 +60,8 @@ const editPageRoleForm = (page, roles, req) =>
   });
 
 /**
- * @param {object} page 
- * @param {object} req 
+ * @param {object} page
+ * @param {object} req
  * @returns {string}
  */
 const page_dropdown = (page, req) =>
@@ -101,8 +101,8 @@ const page_dropdown = (page, req) =>
   ]);
 
 /**
- * 
- * @param {object} req 
+ *
+ * @param {object} req
  * @returns {Promise<Form>}
  */
 const pagePropertiesForm = async (req) => {
@@ -146,9 +146,9 @@ const pagePropertiesForm = async (req) => {
 };
 
 /**
- * 
- * @param {object} req 
- * @param {object} context 
+ *
+ * @param {object} req
+ * @param {object} context
  * @returns {Promise<object>}
  */
 const pageBuilderData = async (req, context) => {
@@ -225,9 +225,9 @@ const pageBuilderData = async (req, context) => {
 };
 
 /**
- * @param {*} rows 
- * @param {*} roles 
- * @param {object} req 
+ * @param {*} rows
+ * @param {*} roles
+ * @param {object} req
  * @returns {div}
  */
 const getPageList = (rows, roles, req) => {
@@ -308,7 +308,6 @@ const getRootPageForm = (pages, roles, req) => {
  */
 router.get(
   "/",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const pages = await Page.find({}, { orderBy: "name" });
@@ -339,10 +338,10 @@ router.get(
 );
 
 /**
- * @param {*} contents 
- * @param {*} noCard 
- * @param {object} req 
- * @param {*} page 
+ * @param {*} contents
+ * @param {*} noCard
+ * @param {object} req
+ * @param {*} page
  * @returns {*}
  */
 const wrap = (contents, noCard, req, page) => ({
@@ -372,7 +371,6 @@ const wrap = (contents, noCard, req, page) => ({
  */
 router.get(
   "/edit-properties/:pagename",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { pagename } = req.params;
@@ -401,7 +399,6 @@ router.get(
  */
 router.get(
   "/new",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const form = await pagePropertiesForm(req);
@@ -420,7 +417,6 @@ router.get(
  */
 router.post(
   "/edit-properties",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const form = await pagePropertiesForm(req);
@@ -456,7 +452,6 @@ router.post(
  */
 router.get(
   "/edit/:pagename",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { pagename } = req.params;
@@ -498,7 +493,6 @@ router.get(
  */
 router.post(
   "/edit/:pagename",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { pagename } = req.params;
@@ -529,7 +523,6 @@ router.post(
  */
 router.post(
   "/savebuilder/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -551,7 +544,6 @@ router.post(
  */
 router.post(
   "/delete/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -570,7 +562,6 @@ router.post(
  */
 router.post(
   "/set_root_page",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const pages = await Page.find({}, { orderBy: "name" });
@@ -598,7 +589,6 @@ router.post(
  */
 router.post(
   "/add-to-menu/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -628,7 +618,6 @@ router.post(
  */
 router.post(
   "/clone/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -650,7 +639,6 @@ router.post(
  */
 router.post(
   "/setrole/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;

package/routes/plugins.js

@@ -1,12 +1,12 @@
 /**
  * Plugin Handler for Admin zone
- * @category server 
+ * @category server
  * @module routes/plugins
  * @subcategory routes
  */
 
 const Router = require("express-promise-router");
-const { setTenant, isAdmin, error_catcher } = require("./utils.js");
+const { isAdmin, error_catcher } = require("./utils.js");
 const {
   mkTable,
   renderForm,
@@ -189,8 +189,8 @@ const get_store_items = async () => {
 };
 
 /**
- * @param {object} req 
- * @param {object} row 
+ * @param {object} req
+ * @param {object} row
  * @returns {a|string}
  */
 const cfg_link = (req, row) => {
@@ -219,8 +219,8 @@ const cfg_link = (req, row) => {
 };
 
 /**
- * @param {object} req 
- * @param {object} row 
+ * @param {object} req
+ * @param {object} row
  * @returns {a}
  */
 const info_link = (req, row) =>
@@ -235,15 +235,15 @@ const info_link = (req, row) =>
   );
 
 /**
- * @param {string} title 
+ * @param {string} title
  * @returns {span}
  */
-  const badge = (title) =>
+const badge = (title) =>
   span({ class: "badge badge-secondary plugin-store" }, title);
 
 /**
- * 
- * @param {object} req 
+ *
+ * @param {object} req
  * @returns {function}
  */
 const store_item_html = (req) => (item) => ({
@@ -334,7 +334,7 @@ const store_item_html = (req) => (item) => ({
 });
 
 /**
- * @param {object} req 
+ * @param {object} req
  * @returns {ul}
  */
 const storeNavPills = (req) => {
@@ -365,8 +365,8 @@ const storeNavPills = (req) => {
 };
 
 /**
- * @param {object[]} items 
- * @param {object} query 
+ * @param {object[]} items
+ * @param {object} query
  * @returns {object[]}
  */
 const filter_items = (items, query) => {
@@ -376,8 +376,8 @@ const filter_items = (items, query) => {
 };
 
 /**
- * @param {string} s 
- * @param {string} q 
+ * @param {string} s
+ * @param {string} q
  * @returns {boolean}
  */
 const match_string = (s, q) => {
@@ -387,7 +387,7 @@ const match_string = (s, q) => {
 
 /**
  * @param {string} p
- * @param {string} q 
+ * @param {string} q
  * @returns {boolean}
  */
 const satisfy_q = (p, q) => {
@@ -395,8 +395,8 @@ const satisfy_q = (p, q) => {
 };
 
 /**
- * @param {object[]} items 
- * @param {object} query 
+ * @param {object[]} items
+ * @param {object} query
  * @returns {object[]}
  */
 const filter_items_set = (items, query) => {
@@ -415,7 +415,7 @@ const filter_items_set = (items, query) => {
 };
 
 /**
- * @param {object} req 
+ * @param {object} req
  * @returns {div}
  */
 const store_actions_dropdown = (req) =>
@@ -483,8 +483,8 @@ const store_actions_dropdown = (req) =>
   );
 
 /**
- * @param {object[]} items 
- * @param {object} req 
+ * @param {object[]} items
+ * @param {object} req
  * @returns {object}
  */
 const plugin_store_html = (items, req) => {
@@ -525,7 +525,6 @@ const plugin_store_html = (items, req) => {
  */
 router.get(
   "/",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const items = await get_store_items();
@@ -542,7 +541,6 @@ router.get(
  */
 router.get(
   "/configure/:name",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { name } = req.params;
@@ -575,7 +573,6 @@ router.get(
  */
 router.post(
   "/configure/:name",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { name } = req.params;
@@ -617,7 +614,6 @@ router.post(
  */
 router.get(
   "/new",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     res.sendWrap(req.__(`New Plugin`), {
@@ -648,7 +644,6 @@ router.get(
  */
 router.get(
   "/public/:plugin/*",
-  setTenant,
   error_catcher(async (req, res) => {
     const { plugin } = req.params;
     const filepath = req.params[0];
@@ -674,7 +669,6 @@ router.get(
  */
 router.get(
   "/pubdeps/:plugin/:dependency/:version/*",
-  setTenant,
   error_catcher(async (req, res) => {
     const { plugin, dependency } = req.params;
     const filepath = req.params[0];
@@ -707,7 +701,6 @@ router.get(
  */
 router.get(
   "/info/:name",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { name } = req.params;
@@ -816,7 +809,6 @@ router.get(
  */
 router.get(
   "/refresh",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     await getState().deleteConfig(
@@ -840,7 +832,6 @@ router.get(
  */
 router.get(
   "/upgrade",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const installed_plugins = await Plugin.find({});
@@ -861,7 +852,6 @@ router.get(
  */
 router.get(
   "/upgrade-plugin/:name",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { name } = req.params;
@@ -882,7 +872,6 @@ router.get(
  */
 router.post(
   "/",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const plugin = new Plugin(req.body);
@@ -918,7 +907,6 @@ router.post(
  */
 router.post(
   "/delete/:name",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { name } = req.params;
@@ -954,7 +942,6 @@ router.post(
  */
 router.post(
   "/install/:name",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { name } = req.params;