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

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");
@@ -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;
@@ -722,7 +715,6 @@ router.post(
  */
 router.post(
   "/preview/:tableName/:fieldName/",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     res.send("");

package/routes/files.js

@@ -8,6 +8,7 @@ const Router = require("express-promise-router");
 const File = require("@saltcorn/data/models/file");
 const User = require("@saltcorn/data/models/user");
 const { getState } = require("@saltcorn/data/db/state");
+const s3storage = require("../s3storage");
 
 const {
   mkTable,
@@ -16,7 +17,7 @@ const {
   post_btn,
   post_delete_btn,
 } = require("@saltcorn/markup");
-const { setTenant, isAdmin, error_catcher } = require("./utils.js");
+const { isAdmin, error_catcher } = require("./utils.js");
 const {
   span,
   h5,
@@ -37,6 +38,11 @@ const {
 const { csrfField } = require("./utils");
 const { editRoleForm, fileUploadForm } = require("../markup/forms.js");
 const { strictParseInt } = require("@saltcorn/data/plugin-helper");
+const {
+  send_files_page,
+  config_fields_form,
+  save_config_from_form,
+} = require("../markup/admin");
 
 /**
  * @type {object}
@@ -49,9 +55,9 @@ const router = new Router();
 module.exports = router;
 
 /**
- * @param {*} file 
- * @param {*} roles 
- * @param {*} req 
+ * @param {*} file
+ * @param {*} roles
+ * @param {*} req
  * @returns {Form}
  */
 const editFileRoleForm = (file, roles, req) =>
@@ -70,61 +76,53 @@ const editFileRoleForm = (file, roles, req) =>
  */
 router.get(
   "/",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const rows = await File.find({}, { orderBy: "filename" });
     const roles = await User.get_roles();
-    res.sendWrap("Files", {
-      above: [
-        {
-          type: "breadcrumbs",
-          crumbs: [
-            { text: req.__("Settings"), href: "/settings" },
-            { text: req.__("Files") },
-          ],
-        },
-        {
-          type: "card",
-          contents: [
-            mkTable(
-              [
-                {
-                  label: req.__("Filename"),
-                  key: (r) =>
-                    div(
-                      { "data-inline-edit-dest-url": `/files/setname/${r.id}` },
-                      r.filename
-                    ),
-                },
-                { label: req.__("Size (KiB)"), key: "size_kb", align: "right" },
-                { label: req.__("Media type"), key: (r) => r.mimetype },
-                {
-                  label: req.__("Role to access"),
-                  key: (r) => editFileRoleForm(r, roles, req),
-                },
-                {
-                  label: req.__("Link"),
-                  key: (r) => link(`/files/serve/${r.id}`, req.__("Link")),
-                },
-                {
-                  label: req.__("Download"),
-                  key: (r) =>
-                    link(`/files/download/${r.id}`, req.__("Download")),
-                },
-                {
-                  label: req.__("Delete"),
-                  key: (r) =>
-                    post_delete_btn(`/files/delete/${r.id}`, req, r.filename),
-                },
-              ],
-              rows,
-              { hover: true }
-            ),
-            fileUploadForm(req),
-          ],
-        },
-      ],
+    send_files_page({
+      res,
+      req,
+      active_sub: "Files",
+      contents: {
+        type: "card",
+        contents: [
+          mkTable(
+            [
+              {
+                label: req.__("Filename"),
+                key: (r) =>
+                  div(
+                    { "data-inline-edit-dest-url": `/files/setname/${r.id}` },
+                    r.filename
+                  ),
+              },
+              { label: req.__("Size (KiB)"), key: "size_kb", align: "right" },
+              { label: req.__("Media type"), key: (r) => r.mimetype },
+              {
+                label: req.__("Role to access"),
+                key: (r) => editFileRoleForm(r, roles, req),
+              },
+              {
+                label: req.__("Link"),
+                key: (r) => link(`/files/serve/${r.id}`, req.__("Link")),
+              },
+              {
+                label: req.__("Download"),
+                key: (r) => link(`/files/download/${r.id}`, req.__("Download")),
+              },
+              {
+                label: req.__("Delete"),
+                key: (r) =>
+                  post_delete_btn(`/files/delete/${r.id}`, req, r.filename),
+              },
+            ],
+            rows,
+            { hover: true }
+          ),
+          fileUploadForm(req),
+        ],
+      },
     });
   })
 );
@@ -137,7 +135,6 @@ router.get(
  */
 router.get(
   "/download/:id",
-  setTenant,
   error_catcher(async (req, res) => {
     const role = req.isAuthenticated() ? req.user.role_id : 10;
     const user_id = req.user && req.user.id;
@@ -145,7 +142,8 @@ router.get(
     const file = await File.findOne({ id });
     if (role <= file.min_role_read || (user_id && user_id === file.user_id)) {
       res.type(file.mimetype);
-      res.download(file.location, file.filename);
+      if (file.s3_store) s3storage.serveObject(file, res, true);
+      else res.download(file.location, file.filename);
     } else {
       req.flash("warning", req.__("Not authorized"));
       res.redirect("/");
@@ -161,7 +159,6 @@ router.get(
  */
 router.get(
   "/serve/:id",
-  setTenant,
   error_catcher(async (req, res) => {
     const role = req.isAuthenticated() ? req.user.role_id : 10;
     const user_id = req.user && req.user.id;
@@ -181,7 +178,8 @@ router.get(
       res.type(file.mimetype);
       const cacheability = file.min_role_read === 10 ? "public" : "private";
       res.set("Cache-Control", `${cacheability}, max-age=86400`);
-      res.sendFile(file.location);
+      if (file.s3_store) s3storage.serveObject(file, res, false);
+      else res.sendFile(file.location);
     } else {
       req.flash("warning", req.__("Not authorized"));
       res.redirect("/");
@@ -197,7 +195,6 @@ router.get(
  */
 router.post(
   "/setrole/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -225,7 +222,6 @@ router.post(
  */
 router.post(
   "/setname/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -244,7 +240,6 @@ router.post(
  */
 router.post(
   "/upload",
-  setTenant,
   error_catcher(async (req, res) => {
     let jsonResp = {};
     const min_role_upload = getState().getConfig("min_role_upload", 1);
@@ -297,12 +292,18 @@ router.post(
  */
 router.post(
   "/delete/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
     const f = await File.findOne({ id });
-    const result = await f.delete();
+    if (!f) {
+      req.flash("error", "File not found");
+      res.redirect("/files");
+      return;
+    }
+    const result = await f.delete(
+      f.s3_store ? s3storage.unlinkObject : undefined
+    );
     if (result && result.error) {
       req.flash("error", result.error);
     } else {
@@ -311,3 +312,82 @@ router.post(
     res.redirect(`/files`);
   })
 );
+
+/**
+ * Storage settings form definition
+ * @param {object} req request
+ * @returns {Promise<Form>} form
+ */
+const storage_form = async (req) => {
+  const form = await config_fields_form({
+    req,
+    field_names: [
+      "storage_s3_enabled",
+      "storage_s3_bucket",
+      "storage_s3_path_prefix",
+      "storage_s3_endpoint",
+      "storage_s3_region",
+      "storage_s3_access_key",
+      "storage_s3_access_secret",
+      "storage_s3_secure",
+    ],
+    action: "/files/storage",
+  });
+  form.submitButtonClass = "btn-outline-primary";
+  form.submitLabel = req.__("Save");
+  form.onChange = "remove_outline(this)";
+  return form;
+};
+
+/**
+ * @name get/storage
+ * @function
+ * @memberof module:routes/admin~routes/adminRouter
+ */
+router.get(
+  "/storage",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const form = await storage_form(req);
+    send_files_page({
+      res,
+      req,
+      active_sub: "Storage",
+      contents: {
+        type: "card",
+        title: req.__("Storage settings"),
+        contents: [renderForm(form, req.csrfToken())],
+      },
+    });
+  })
+);
+
+/**
+ * @name post/email
+ * @function
+ * @memberof module:routes/admin~routes/adminRouter
+ */
+router.post(
+  "/storage",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const form = await storage_form(req);
+    form.validate(req.body);
+    if (form.hasErrors) {
+      send_admin_page({
+        res,
+        req,
+        active_sub: "Storage",
+        contents: {
+          type: "card",
+          title: req.__("Storage settings"),
+          contents: [renderForm(form, req.csrfToken())],
+        },
+      });
+    } else {
+      await save_config_from_form(form);
+      req.flash("success", req.__("Storage settings updated"));
+      res.redirect("/files/storage");
+    }
+  })
+);

package/routes/homepage.js

@@ -19,6 +19,7 @@ const { get_latest_npm_version } = require("@saltcorn/data/models/config");
 const packagejson = require("../package.json");
 const Trigger = require("@saltcorn/data/models/trigger");
 const { fileUploadForm } = require("../markup/forms");
+const { get_base_url } = require("./utils.js");
 
 /**
  * @param {*} tables
@@ -224,6 +225,8 @@ const usersTab = async (req, users, roleMap) => {
  * @returns {Promise<div>}
  */
 const actionsTab = async (req, triggers) => {
+  const base_url = get_base_url(req);
+
   return div(
     { class: "pb-3" },
     triggers.length <= 1 &&

package/routes/infoarch.js

@@ -35,7 +35,6 @@ module.exports = router;
  */
 router.get(
   "/",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     res.redirect(`/menu`);
@@ -43,7 +42,7 @@ router.get(
 );
 
 /**
- * @param {object} req 
+ * @param {object} req
  * @returns {Form}
  */
 const languageForm = (req) =>
@@ -83,7 +82,6 @@ const languageForm = (req) =>
  */
 router.get(
   "/localizer",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const cfgLangs = getState().getConfig("localizer_languages");
@@ -111,13 +109,13 @@ router.get(
               },
               {
                 label: req.__("Default"),
-                key: r=>!!r.is_default
-                ? i({
-                    class: "fas fa-check-circle text-success",
-                  })
-                : "",
+                key: (r) =>
+                  !!r.is_default
+                    ? i({
+                        class: "fas fa-check-circle text-success",
+                      })
+                    : "",
               },
-            
             ],
             Object.values(cfgLangs)
           ),
@@ -143,7 +141,6 @@ router.get(
  */
 router.get(
   "/localizer/add-lang",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     send_infoarch_page({
@@ -167,7 +164,6 @@ router.get(
  */
 router.get(
   "/localizer/edit/:lang",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { lang } = req.params;
@@ -175,8 +171,8 @@ router.get(
     const form = languageForm(req);
     form.values = cfgLangs[lang];
     const { is_default } = form.values;
-    const cfgStrings = getState().getConfig("localizer_strings",{});
-    const translation = cfgStrings[lang] || {}
+    const cfgStrings = getState().getConfig("localizer_strings", {});
+    const translation = cfgStrings[lang] || {};
     const strings = getState()
       .getStringsForI18n()
       .map((s) => ({ in_default: s, translated: translation[s] || s }));
@@ -232,16 +228,14 @@ router.get(
  */
 router.post(
   "/localizer/save-string/:lang/:defstring",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { lang, defstring } = req.params;
 
     const cfgStrings = getState().getConfigCopy("localizer_strings");
-    if(cfgStrings[lang])
-    cfgStrings[lang][defstring] = text(req.body.value)
-    else cfgStrings[lang]={[defstring]: text(req.body.value)}
-    await getState().setConfig("localizer_strings", cfgStrings)
+    if (cfgStrings[lang]) cfgStrings[lang][defstring] = text(req.body.value);
+    else cfgStrings[lang] = { [defstring]: text(req.body.value) };
+    await getState().setConfig("localizer_strings", cfgStrings);
     res.redirect(`/site-structure/localizer/edit/${lang}`);
   })
 );
@@ -254,7 +248,6 @@ router.post(
  */
 router.post(
   "/localizer/save-lang",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const form = languageForm(req);

package/routes/library.js

@@ -6,7 +6,7 @@
 
 const Library = require("@saltcorn/data/models/library");
 const Router = require("express-promise-router");
-const { setTenant, isAdmin, error_catcher } = require("./utils.js");
+const { isAdmin, error_catcher } = require("./utils.js");
 const { send_infoarch_page } = require("../markup/admin.js");
 const { mkTable, post_delete_btn } = require("@saltcorn/markup");
 const { i } = require("@saltcorn/markup/tags");
@@ -29,7 +29,6 @@ module.exports = router;
  */
 router.post(
   "/savefrombuilder",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     await Library.create(req.body);
@@ -45,7 +44,6 @@ router.post(
  */
 router.get(
   "/list",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const libs = await Library.find({});
@@ -89,7 +87,6 @@ router.get(
  */
 router.post(
   "/delete/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;

package/routes/list.js

@@ -14,7 +14,7 @@ const db = require("@saltcorn/data/db");
 const { mkTable, h, link, post_btn } = require("@saltcorn/markup");
 const { a, script, domReady, div, text } = require("@saltcorn/markup/tags");
 const Table = require("@saltcorn/data/models/table");
-const { setTenant, isAdmin, error_catcher } = require("./utils");
+const { isAdmin, error_catcher } = require("./utils");
 const moment = require("moment");
 const { readState } = require("@saltcorn/data/plugin-helper");
 
@@ -39,7 +39,6 @@ module.exports = router;
  */
 router.get(
   "/_versions/:name/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { name, id } = req.params;
@@ -88,7 +87,6 @@ router.get(
  */
 router.post(
   "/_restore/:name/:id/:_version",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { name, id, _version } = req.params;
@@ -152,7 +150,7 @@ const typeToJsGridType = (t, field) => {
 
 /**
  * Version Field
- * @param {string} tname 
+ * @param {string} tname
  * @returns {string}
  */
 const versionsField = (tname) => `
@@ -183,7 +181,6 @@ jsGrid.fields.versions = VersionsField;
  */
 router.get(
   "/:tname",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { tname } = req.params;

package/routes/menu.js

@@ -32,8 +32,8 @@ const router = new Router();
 module.exports = router;
 
 /**
- * 
- * @param {object} req 
+ *
+ * @param {object} req
  * @returns {Promise<Form>}
  */
 const menuForm = async (req) => {
@@ -157,7 +157,7 @@ const menuForm = async (req) => {
 //create -- new
 
 /**
- * @param {object[]} menu_items 
+ * @param {object[]} menu_items
  * @returns {string}
  */
 const menuEditorScript = (menu_items) => `
@@ -202,8 +202,8 @@ const menuEditorScript = (menu_items) => `
   `;
 
 /**
- * @param {object[]} menu_items 
- * @returns {object[]} 
+ * @param {object[]} menu_items
+ * @returns {object[]}
  */
 const menuTojQME = (menu_items) =>
   (menu_items || []).map((mi) => ({
@@ -214,7 +214,7 @@ const menuTojQME = (menu_items) =>
   }));
 
 /**
- * @param {object[]} menu_items 
+ * @param {object[]} menu_items
  * @returns {object[]}
  */
 const jQMEtoMenu = (menu_items) =>
@@ -233,7 +233,6 @@ const jQMEtoMenu = (menu_items) =>
  */
 router.get(
   "/",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const form = await menuForm(req);
@@ -287,7 +286,6 @@ router.get(
  */
 router.post(
   "/",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     if (req.xhr) {

package/routes/packs.js

@@ -5,7 +5,7 @@
  */
 
 const Router = require("express-promise-router");
-const { setTenant, isAdmin, error_catcher } = require("./utils.js");
+const { isAdmin, 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");
@@ -54,7 +54,6 @@ module.exports = router;
  */
 router.get(
   "/create/",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const tables = await Table.find({});
@@ -139,7 +138,6 @@ router.get(
  */
 router.post(
   "/create",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     var pack = {
@@ -211,7 +209,7 @@ router.post(
 );
 
 /**
- * @param {object} req 
+ * @param {object} req
  * @returns {Form}
  */
 const install_pack_form = (req) =>
@@ -236,7 +234,6 @@ const install_pack_form = (req) =>
  */
 router.get(
   "/install",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     res.sendWrap(req.__(`Install Pack`), {
@@ -267,7 +264,6 @@ router.get(
  */
 router.post(
   "/install",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     var pack, error;
@@ -326,7 +322,6 @@ router.post(
  */
 router.post(
   "/install-named/:name",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { name } = req.params;
@@ -363,7 +358,6 @@ router.post(
  */
 router.post(
   "/uninstall/:name",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { name } = req.params;