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

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;

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);
+  })
+);