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

package/routes/scapi.js

@@ -9,7 +9,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 Table = require("@saltcorn/data/models/table");
 const View = require("@saltcorn/data/models/view");
 const Page = require("@saltcorn/data/models/page");
@@ -43,18 +43,17 @@ module.exports = router;
  * @param {object} user user based on access token
  * @returns {boolean}
  */
-function accessAllowedRead(req, user){
-    const role = req.isAuthenticated()
-        ? req.user.role_id
-        : user && user.role_id
-            ? user.role_id
-            : 10;
-
-    if (role === 1) return true;
-    return false;
+function accessAllowedRead(req, user) {
+  const role = req.isAuthenticated()
+    ? req.user.role_id
+    : user && user.role_id
+    ? user.role_id
+    : 10;
+
+  if (role === 1) return true;
+  return false;
 }
 
-
 // todo add paging
 // todo more granular access rights for api. Currently only admin can call this api.
 // todo add support of fields
@@ -66,25 +65,22 @@ function accessAllowedRead(req, user){
  * @function
  */
 router.get(
-    "/sc_tables/",
-    setTenant,
-    error_catcher(async (req, res, next) => {
-
-        await passport.authenticate(
-            "api-bearer",
-            { session: false },
-            async function (err, user, info) {
-                if (accessAllowedRead(req, user)) {
-
-                    const tables = await Table.find({});
-
-                    res.json({ success: tables });
-                } else {
-                    res.status(401).json({ error: req.__("Not authorized") });
-                }
-            }
-        )(req, res, next);
-    })
+  "/sc_tables/",
+  error_catcher(async (req, res, next) => {
+    await passport.authenticate(
+      "api-bearer",
+      { session: false },
+      async function (err, user, info) {
+        if (accessAllowedRead(req, user)) {
+          const tables = await Table.find({});
+
+          res.json({ success: tables });
+        } else {
+          res.status(401).json({ error: req.__("Not authorized") });
+        }
+      }
+    )(req, res, next);
+  })
 );
 
 // todo add paging
@@ -97,28 +93,24 @@ router.get(
  * @function
  */
 router.get(
-    "/sc_views/",
-    setTenant,
-    error_catcher(async (req, res, next) => {
-
-        await passport.authenticate(
-            "api-bearer",
-            { session: false },
-            async function (err, user, info) {
-                if (accessAllowedRead(req, user)) {
-
-                    const views = await View.find({});
-
-                    res.json({ success: views });
-                } else {
-                    res.status(401).json({ error: req.__("Not authorized") });
-                }
-            }
-        )(req, res, next);
-    })
+  "/sc_views/",
+  error_catcher(async (req, res, next) => {
+    await passport.authenticate(
+      "api-bearer",
+      { session: false },
+      async function (err, user, info) {
+        if (accessAllowedRead(req, user)) {
+          const views = await View.find({});
+
+          res.json({ success: views });
+        } else {
+          res.status(401).json({ error: req.__("Not authorized") });
+        }
+      }
+    )(req, res, next);
+  })
 );
 
-
 // todo add paging
 // todo more granular access rights to api. Currently only admin can call this api.
 /**
@@ -129,25 +121,22 @@ router.get(
  * @function
  */
 router.get(
-    "/sc_pages/",
-    setTenant,
-    error_catcher(async (req, res, next) => {
-
-        await passport.authenticate(
-            "api-bearer",
-            { session: false },
-            async function (err, user, info) {
-                if (accessAllowedRead(req, user)) {
-
-                    const pages = await Page.find({});
-
-                    res.json({ success: pages });
-                } else {
-                    res.status(401).json({ error: req.__("Not authorized") });
-                }
-            }
-        )(req, res, next);
-    })
+  "/sc_pages/",
+  error_catcher(async (req, res, next) => {
+    await passport.authenticate(
+      "api-bearer",
+      { session: false },
+      async function (err, user, info) {
+        if (accessAllowedRead(req, user)) {
+          const pages = await Page.find({});
+
+          res.json({ success: pages });
+        } else {
+          res.status(401).json({ error: req.__("Not authorized") });
+        }
+      }
+    )(req, res, next);
+  })
 );
 
 // todo add paging
@@ -160,25 +149,22 @@ router.get(
  * @function
  */
 router.get(
-    "/sc_files/",
-    setTenant,
-    error_catcher(async (req, res, next) => {
-
-        await passport.authenticate(
-            "api-bearer",
-            { session: false },
-            async function (err, user, info) {
-                if (accessAllowedRead(req, user)) {
-
-                    const files = await File.find({});
-
-                    res.json({ success: files });
-                } else {
-                    res.status(401).json({ error: req.__("Not authorized") });
-                }
-            }
-        )(req, res, next);
-    })
+  "/sc_files/",
+  error_catcher(async (req, res, next) => {
+    await passport.authenticate(
+      "api-bearer",
+      { session: false },
+      async function (err, user, info) {
+        if (accessAllowedRead(req, user)) {
+          const files = await File.find({});
+
+          res.json({ success: files });
+        } else {
+          res.status(401).json({ error: req.__("Not authorized") });
+        }
+      }
+    )(req, res, next);
+  })
 );
 
 // todo add paging
@@ -191,25 +177,22 @@ router.get(
  * @function
  */
 router.get(
-    "/sc_triggers/",
-    setTenant,
-    error_catcher(async (req, res, next) => {
-
-        await passport.authenticate(
-            "api-bearer",
-            { session: false },
-            async function (err, user, info) {
-                if (accessAllowedRead(req, user)) {
-
-                    const triggers = await Trigger.find({});
-
-                    res.json({ success: triggers });
-                } else {
-                    res.status(401).json({ error: req.__("Not authorized") });
-                }
-            }
-        )(req, res, next);
-    })
+  "/sc_triggers/",
+  error_catcher(async (req, res, next) => {
+    await passport.authenticate(
+      "api-bearer",
+      { session: false },
+      async function (err, user, info) {
+        if (accessAllowedRead(req, user)) {
+          const triggers = await Trigger.find({});
+
+          res.json({ success: triggers });
+        } else {
+          res.status(401).json({ error: req.__("Not authorized") });
+        }
+      }
+    )(req, res, next);
+  })
 );
 
 // todo add paging
@@ -222,25 +205,22 @@ router.get(
  * @function
  */
 router.get(
-    "/sc_roles/",
-    setTenant,
-    error_catcher(async (req, res, next) => {
-
-        await passport.authenticate(
-            "api-bearer",
-            { session: false },
-            async function (err, user, info) {
-                if (accessAllowedRead(req, user)) {
-
-                    const roles = await Role.find({});
-
-                    res.json({ success: roles });
-                } else {
-                    res.status(401).json({ error: req.__("Not authorized") });
-                }
-            }
-        )(req, res, next);
-    })
+  "/sc_roles/",
+  error_catcher(async (req, res, next) => {
+    await passport.authenticate(
+      "api-bearer",
+      { session: false },
+      async function (err, user, info) {
+        if (accessAllowedRead(req, user)) {
+          const roles = await Role.find({});
+
+          res.json({ success: roles });
+        } else {
+          res.status(401).json({ error: req.__("Not authorized") });
+        }
+      }
+    )(req, res, next);
+  })
 );
 
 // todo add paging
@@ -253,25 +233,22 @@ router.get(
  * @function
  */
 router.get(
-    "/sc_tenants/",
-    setTenant,
-    error_catcher(async (req, res, next) => {
-
-        await passport.authenticate(
-            "api-bearer",
-            { session: false },
-            async function (err, user, info) {
-                if (accessAllowedRead(req, user)) {
-
-                    const tenants = await Tenant.getAllTenants();
-
-                    res.json({ success: tenants });
-                } else {
-                    res.status(401).json({ error: req.__("Not authorized") });
-                }
-            }
-        )(req, res, next);
-    })
+  "/sc_tenants/",
+  error_catcher(async (req, res, next) => {
+    await passport.authenticate(
+      "api-bearer",
+      { session: false },
+      async function (err, user, info) {
+        if (accessAllowedRead(req, user)) {
+          const tenants = await Tenant.getAllTenants();
+
+          res.json({ success: tenants });
+        } else {
+          res.status(401).json({ error: req.__("Not authorized") });
+        }
+      }
+    )(req, res, next);
+  })
 );
 
 // todo add paging
@@ -284,25 +261,22 @@ router.get(
  * @function
  */
 router.get(
-    "/sc_plugins/",
-    setTenant,
-    error_catcher(async (req, res, next) => {
-
-        await passport.authenticate(
-            "api-bearer",
-            { session: false },
-            async function (err, user, info) {
-                if (accessAllowedRead(req, user)) {
-
-                    const plugins = await Plugin.find({});
-
-                    res.json({ success: plugins });
-                } else {
-                    res.status(401).json({ error: req.__("Not authorized") });
-                }
-            }
-        )(req, res, next);
-    })
+  "/sc_plugins/",
+  error_catcher(async (req, res, next) => {
+    await passport.authenticate(
+      "api-bearer",
+      { session: false },
+      async function (err, user, info) {
+        if (accessAllowedRead(req, user)) {
+          const plugins = await Plugin.find({});
+
+          res.json({ success: plugins });
+        } else {
+          res.status(401).json({ error: req.__("Not authorized") });
+        }
+      }
+    )(req, res, next);
+  })
 );
 
 // todo add paging
@@ -315,23 +289,20 @@ router.get(
  * @function
  */
 router.get(
-    "/sc_config/",
-    setTenant,
-    error_catcher(async (req, res, next) => {
-
-        await passport.authenticate(
-            "api-bearer",
-            { session: false },
-            async function (err, user, info) {
-                if (accessAllowedRead(req, user)) {
-
-                    const configVars = await Config.getAllConfig();
-
-                    res.json({ success: configVars });
-                } else {
-                    res.status(401).json({ error: req.__("Not authorized") });
-                }
-            }
-        )(req, res, next);
-    })
-);
+  "/sc_config/",
+  error_catcher(async (req, res, next) => {
+    await passport.authenticate(
+      "api-bearer",
+      { session: false },
+      async function (err, user, info) {
+        if (accessAllowedRead(req, user)) {
+          const configVars = await Config.getAllConfig();
+
+          res.json({ success: configVars });
+        } else {
+          res.status(401).json({ error: req.__("Not authorized") });
+        }
+      }
+    )(req, res, next);
+  })
+);

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;