@saltcorn/server 0.6.2 → 0.6.3-beta.3

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.6.2",
+  "version": "0.6.3-beta.3",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@saltcorn/base-plugin": "0.6.2",
-    "@saltcorn/builder": "0.6.2",
-    "@saltcorn/data": "0.6.2",
+    "@saltcorn/base-plugin": "0.6.3-beta.3",
+    "@saltcorn/builder": "0.6.3-beta.3",
+    "@saltcorn/data": "0.6.3-beta.3",
     "greenlock-express": "^4.0.3",
-    "@saltcorn/markup": "0.6.2",
-    "@saltcorn/sbadmin2": "0.6.2",
+    "@saltcorn/markup": "0.6.3-beta.3",
+    "@saltcorn/sbadmin2": "0.6.3-beta.3",
     "@socket.io/cluster-adapter": "^0.1.0",
     "@socket.io/sticky": "^1.0.1",
     "connect-flash": "^0.1.1",
@@ -34,13 +34,17 @@
     "moment": "^2.27.0",
     "node-fetch": "2.6.2",
     "node-watch": "^0.7.2",
+    "notp": "2.0.3",
     "passport": "^0.4.1",
     "passport-custom": "^1.1.1",
     "passport-http-bearer": "^1.0.1",
+    "passport-totp": "0.0.2",
     "pg": "^8.2.1",
     "pluralize": "^8.0.0",
+    "qrcode": "1.5.0",
     "socket.io": "4.2.0",
     "tmp-promise": "^3.0.2",
+    "thirty-two": "1.0.2",
     "multer-s3": "^2.10.0",
     "multer": "^1.4.3",
     "aws-sdk": "^2.1037.0",
@@ -75,6 +79,7 @@
       "@saltcorn/sqlite/(.*)": "@saltcorn/sqlite/dist/$1",
       "@saltcorn/db-common/(.*)": "@saltcorn/db-common/dist/$1",
       "@saltcorn/data/(.*)": "@saltcorn/data/dist/$1",
+      "@saltcorn/types/(.*)": "@saltcorn/types/dist/$1",
       "@saltcorn/markup$": "@saltcorn/markup/dist",
       "@saltcorn/markup/(.*)": "@saltcorn/markup/dist/$1"
     }

package/public/gridedit.js

@@ -179,7 +179,9 @@ DateField.prototype = new jsGrid.Field({
     setTimeout(function () {
       flatpickr(insertPicker, {
         enableTime: true,
-        dateFormat: "Y-m-d H:i",
+        dateFormat: "Z",
+        altInput: true,
+        altFormat: "Y-m-d h:i K",
       });
     });
     return insertPicker;
@@ -192,7 +194,9 @@ DateField.prototype = new jsGrid.Field({
     setTimeout(function () {
       flatpickr(editPicker, {
         enableTime: true,
-        dateFormat: "Y-m-d H:i",
+        dateFormat: "Z",
+        altInput: true,
+        altFormat: "Y-m-d h:i K",
       });
     });
     return editPicker;

package/public/saltcorn.js

@@ -32,7 +32,9 @@ function apply_showif() {
     var e = $(element);
     var to_show = new Function("e", "return " + e.attr("data-show-if"));
     if (to_show(e))
-      e.show().find("input, textarea, button, select").prop("disabled", false);
+      e.show()
+        .find("input, textarea, button, select")
+        .prop("disabled", e.attr("data-disabled") || false);
     else
       e.hide().find("input, textarea, button, select").prop("disabled", true);
   });
@@ -585,11 +587,11 @@ function test_formula(tablename, stored) {
 function align_dropdown(id) {
   setTimeout(() => {
     if ($("#dm" + id).hasClass("show")) {
-      var inputWidth = $(".input-group.search-bar").outerWidth();
-      $(".dropdown-menu.search-bar").css("width", inputWidth);
-      var d0pos = $(".input-group.search-bar").offset();
+      var inputWidth = $("#search-input-group-" + id).outerWidth();
+      $("#dm" + id).css("width", inputWidth);
+      var d0pos = $("#search-input-group-" + id).offset();
       $("#dm" + id).offset({ left: d0pos.left });
-      $(document).on("click", ".dropdown-menu.search-bar", function (e) {
+      $(document).on("click", "#dm" + id, function (e) {
         e.stopPropagation();
       });
     }

package/restart_watcher.js

@@ -120,6 +120,9 @@ const listenForChanges = (projectDirs, pluginDirs) => {
         (event, file) => {
           console.log("'%s' changed \n re-starting now", file);
           closeWatchers();
+          spawnSync("npm", ["run", "tsc"], {
+            stdio: "inherit",
+          });
           process.exit();
         }
       )

package/routes/admin.js

@@ -769,6 +769,7 @@ router.post(
       for (const file of files) {
         await file.delete();
       }
+      if (db.reset_sequence) await db.reset_sequence("_sc_files");
     }
     if (form.values.plugins) {
       const ps = await Plugin.find();

package/routes/api.js

@@ -65,11 +65,12 @@ const limitFields = (fields) => (r) => {
  * @returns {boolean}
  */
 function accessAllowedRead(req, user, table) {
-  const role = req.isAuthenticated()
-    ? req.user.role_id
-    : user && user.role_id
-    ? user.role_id
-    : 10;
+  const role =
+    req.user && req.user.id
+      ? req.user.role_id
+      : user && user.role_id
+      ? user.role_id
+      : 10;
 
   return role <= table.min_role_read;
 }
@@ -82,11 +83,12 @@ function accessAllowedRead(req, user, table) {
  * @returns {boolean}
  */
 function accessAllowedWrite(req, user, table) {
-  const role = req.isAuthenticated()
-    ? req.user.role_id
-    : user && user.role_id
-    ? user.role_id
-    : 10;
+  const role =
+    req.user && req.user.id
+      ? req.user.role_id
+      : user && user.role_id
+      ? user.role_id
+      : 10;
 
   return role <= table.min_role_write;
 }
@@ -98,11 +100,12 @@ function accessAllowedWrite(req, user, table) {
  * @returns {boolean}
  */
 function accessAllowed(req, user, trigger) {
-  const role = req.isAuthenticated()
-    ? req.user.role_id
-    : user && user.role_id
-    ? user.role_id
-    : 10;
+  const role =
+    req.user && req.user.id
+      ? req.user.role_id
+      : user && user.role_id
+      ? user.role_id
+      : 10;
 
   return role <= trigger.min_role;
 }

package/routes/delete.js

@@ -33,7 +33,7 @@ router.post(
     const { name, id } = req.params;
     const { redirect } = req.query;
     const table = await Table.findOne({ name });
-    const role = req.isAuthenticated() ? req.user.role_id : 10;
+    const role = req.user && req.user.id ? req.user.role_id : 10;
     try {
       if (role <= table.min_role_write) await table.deleteRows({ id });
       else if (table.ownership_field_id && req.user) {

package/routes/edit.js

@@ -37,7 +37,7 @@ router.post(
     const { name, id, field_name } = req.params;
     const { redirect } = req.query;
     const table = await Table.findOne({ name });
-    const role = req.isAuthenticated() ? req.user.role_id : 10;
+    const role = req.user && req.user.id ? req.user.role_id : 10;
     if (role <= table.min_role_write) await table.toggleBool(+id, field_name);
     else
       req.flash(

package/routes/fields.js

@@ -26,6 +26,7 @@ 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");
+const FieldRepeat = require("@saltcorn/data/models/fieldrepeat");
 
 /**
  * @type {object}
@@ -161,8 +162,9 @@ const translateAttributes = (attrs, req) =>
  * @returns {object}
  */
 const translateAttribute = (attr, req) => {
-  const res = { ...attr };
+  let res = { ...attr };
   if (res.sublabel) res.sublabel = req.__(res.sublabel);
+  if (res.isRepeat) res = new FieldRepeat(res);
   return res;
 };
 
@@ -660,7 +662,15 @@ router.post(
     if (fieldName.includes(".")) {
       const [refNm, targetNm] = fieldName.split(".");
       const ref = fields.find((f) => f.name === refNm);
+      if (!ref) {
+        res.send("");
+        return;
+      }
       const reftable = await Table.findOne({ name: ref.reftable_name });
+      if (!reftable) {
+        res.send("");
+        return;
+      }
       const reffields = await reftable.getFields();
       field = reffields.find((f) => f.name === targetNm);
       row = await reftable.getRow({});

package/routes/files.js

@@ -136,7 +136,7 @@ router.get(
 router.get(
   "/download/:id",
   error_catcher(async (req, res) => {
-    const role = req.isAuthenticated() ? req.user.role_id : 10;
+    const role = req.user && req.user.id ? req.user.role_id : 10;
     const user_id = req.user && req.user.id;
     const { id } = req.params;
     const file = await File.findOne({ id });
@@ -160,7 +160,7 @@ router.get(
 router.get(
   "/serve/:id",
   error_catcher(async (req, res) => {
-    const role = req.isAuthenticated() ? req.user.role_id : 10;
+    const role = req.user && req.user.id ? req.user.role_id : 10;
     const user_id = req.user && req.user.id;
     const { id } = req.params;
     let file;
@@ -243,7 +243,7 @@ router.post(
   error_catcher(async (req, res) => {
     let jsonResp = {};
     const min_role_upload = getState().getConfig("min_role_upload", 1);
-    const role = req.isAuthenticated() ? req.user.role_id : 10;
+    const role = req.user && req.user.id ? req.user.role_id : 10;
     if (role > +min_role_upload) {
       if (!req.xhr) req.flash("warning", req.__("Not authorized"));
       else jsonResp = { error: "Not authorized" };

package/routes/homepage.js

@@ -398,7 +398,7 @@ const welcome_page = async (req) => {
  * @returns {Promise<void>}
  */
 const no_views_logged_in = async (req, res) => {
-  const role = req.isAuthenticated() ? req.user.role_id : 10;
+  const role = req.user && req.user.id ? req.user.role_id : 10;
   if (role > 1 || req.user.tenant !== db.getTenantSchema())
     res.sendWrap(req.__("Hello"), req.__("Welcome to Saltcorn!"));
   else {
@@ -455,25 +455,26 @@ const get_config_response = async (role_id, res, req) => {
   }
 };
 
-/**
- * Function assigned to 'module.exports'.
- * @param {object} req
- * @param {object} res
- * @returns {Promise<void>}
- */
-module.exports = async (req, res) => {
-  const isAuth = req.isAuthenticated();
-  const role_id = req.user ? req.user.role_id : 10;
-  const cfgResp = await get_config_response(role_id, res, req);
-  if (cfgResp) return;
+module.exports =
+  /**
+   * Function assigned to 'module.exports'.
+   * @param {object} req
+   * @param {object} res
+   * @returns {Promise<void>}
+   */
+  async (req, res) => {
+    const isAuth = req.user && req.user.id;
+    const role_id = req.user ? req.user.role_id : 10;
+    const cfgResp = await get_config_response(role_id, res, req);
+    if (cfgResp) return;
 
-  if (!isAuth) {
-    const hasUsers = await User.nonEmpty();
-    if (!hasUsers) {
-      res.redirect("/auth/create_first_user");
-      return;
-    } else res.redirect("/auth/login");
-  } else {
-    await no_views_logged_in(req, res);
-  }
-};
+    if (!isAuth) {
+      const hasUsers = await User.nonEmpty();
+      if (!hasUsers) {
+        res.redirect("/auth/create_first_user");
+        return;
+      } else res.redirect("/auth/login");
+    } else {
+      await no_views_logged_in(req, res);
+    }
+  };

package/routes/index.js

@@ -36,7 +36,7 @@
  * @property {module:routes/utils} utils
  * @property {module:routes/view} view
  * @property {module:routes/viewedit} viewedit
- * 
+ *
  * @category server
  * @subcategory routes
  */
@@ -71,38 +71,39 @@ const useradmin = require("../auth/admin");
 const roleadmin = require("../auth/roleadmin");
 const scapi = require("./scapi");
 
-/**
- * Function assigned to 'module.exports'
- * @returns {void}
- */
-module.exports = (app) => {
-  app.use("/table", table);
-  app.use("/field", field);
-  app.use("/files", files);
-  app.use("/list", list);
-  app.use("/edit", edit);
-  app.use("/config", config);
-  app.use("/plugins", plugins);
-  app.use("/packs", packs);
-  app.use("/menu", menu);
-  app.use("/view", view);
-  app.use("/crashlog", crashlog);
-  app.use("/events", events);
-  app.use("/page", page);
-  app.use("/settings", settings);
-  app.use("/pageedit", pageedit);
-  app.use("/actions", actions);
-  app.use("/eventlog", eventlog);
-  app.use("/library", library);
-  app.use("/site-structure", infoarch);
-  app.use("/search", search);
-  app.use("/admin", admin);
-  app.use("/tenant", tenant);
-  app.use("/api", api);
-  app.use("/viewedit", viewedit);
-  app.use("/delete", del);
-  app.use("/auth", auth);
-  app.use("/useradmin", useradmin);
-  app.use("/roleadmin", roleadmin);
-  app.use("/scapi", scapi);
-};
+module.exports =
+  /**
+   * Function assigned to 'module.exports'
+   * @returns {void}
+   */
+  (app) => {
+    app.use("/table", table);
+    app.use("/field", field);
+    app.use("/files", files);
+    app.use("/list", list);
+    app.use("/edit", edit);
+    app.use("/config", config);
+    app.use("/plugins", plugins);
+    app.use("/packs", packs);
+    app.use("/menu", menu);
+    app.use("/view", view);
+    app.use("/crashlog", crashlog);
+    app.use("/events", events);
+    app.use("/page", page);
+    app.use("/settings", settings);
+    app.use("/pageedit", pageedit);
+    app.use("/actions", actions);
+    app.use("/eventlog", eventlog);
+    app.use("/library", library);
+    app.use("/site-structure", infoarch);
+    app.use("/search", search);
+    app.use("/admin", admin);
+    app.use("/tenant", tenant);
+    app.use("/api", api);
+    app.use("/viewedit", viewedit);
+    app.use("/delete", del);
+    app.use("/auth", auth);
+    app.use("/useradmin", useradmin);
+    app.use("/roleadmin", roleadmin);
+    app.use("/scapi", scapi);
+  };

package/routes/page.js

@@ -37,7 +37,7 @@ router.get(
   error_catcher(async (req, res) => {
     const { pagename } = req.params;
 
-    const role = req.isAuthenticated() ? req.user.role_id : 10;
+    const role = req.user && req.user.id ? req.user.role_id : 10;
     const db_page = await Page.findOne({ name: pagename });
     if (db_page && role <= db_page.min_role) {
       const contents = await db_page.run(req.query, { res, req });
@@ -73,7 +73,7 @@ router.post(
   "/:pagename/action/:rndid",
   error_catcher(async (req, res) => {
     const { pagename, rndid } = req.params;
-    const role = req.isAuthenticated() ? req.user.role_id : 10;
+    const role = req.user && req.user.id ? req.user.role_id : 10;
     const db_page = await Page.findOne({ name: pagename });
     if (db_page && role <= db_page.min_role) {
       let col;

package/routes/plugins.js

@@ -511,7 +511,7 @@ const plugin_store_html = (items, req) => {
       },
       {
         besides: items.map(store_item_html(req)),
-        widths: items.map((item) => 4), // todo warning that item uis unused
+        widths: items.map(() => 4),
       },
     ],
   };

package/routes/scapi.js

@@ -44,11 +44,12 @@ module.exports = router;
  * @returns {boolean}
  */
 function accessAllowedRead(req, user) {
-  const role = req.isAuthenticated()
-    ? req.user.role_id
-    : user && user.role_id
-    ? user.role_id
-    : 10;
+  const role =
+    req.user && req.user.id
+      ? req.user.role_id
+      : user && user.role_id
+      ? user.role_id
+      : 10;
 
   if (role === 1) return true;
   return false;

package/routes/utils.js

@@ -49,7 +49,13 @@ function isAdmin(req, res, next) {
     next();
   } else {
     req.flash("danger", req.__("Must be admin"));
-    res.redirect(req.user ? "/" : "/auth/login");
+    res.redirect(
+      req.user && req.user.pending_user
+        ? "/auth/twofa/login/totp"
+        : req.user
+        ? "/"
+        : "/auth/login"
+    );
   }
 }
 

package/routes/view.js

@@ -37,27 +37,28 @@ module.exports = router;
  * @function
  */
 router.get(
-  "/:viewname",
+  ["/:viewname", "/:viewname/*"],
   error_catcher(async (req, res) => {
     const { viewname } = req.params;
-
+    const query = { ...req.query };
     const view = await View.findOne({ name: viewname });
-    const role = req.isAuthenticated() ? req.user.role_id : 10;
-
+    const role = req.user && req.user.id ? req.user.role_id : 10;
     if (!view) {
       req.flash("danger", req.__(`No such view: %s`, text(viewname)));
       res.redirect("/");
       return;
     }
+
+    view.rewrite_query_from_slug(query, req.params);
     if (
       role > view.min_role &&
-      !(await view.authorise_get({ query: req.query, req, ...view }))
+      !(await view.authorise_get({ query, req, ...view }))
     ) {
       req.flash("danger", req.__("Not authorized"));
       res.redirect("/");
       return;
     }
-    const contents = await view.run_possibly_on_page(req.query, req, res);
+    const contents = await view.run_possibly_on_page(query, req, res);
     const title = scan_for_page_title(contents, view.name);
     res.sendWrap(
       title,
@@ -120,7 +121,7 @@ router.post(
   "/:viewname/:route",
   error_catcher(async (req, res) => {
     const { viewname, route } = req.params;
-    const role = req.isAuthenticated() ? req.user.role_id : 10;
+    const role = req.user && req.user.id ? req.user.role_id : 10;
 
     const view = await View.findOne({ name: viewname });
     if (!view) {
@@ -142,16 +143,21 @@ router.post(
  * @function
  */
 router.post(
-  "/:viewname",
+  ["/:viewname", "/:viewname/*"],
   error_catcher(async (req, res) => {
     const { viewname } = req.params;
-    const role = req.isAuthenticated() ? req.user.role_id : 10;
+    const role = req.user && req.user.id ? req.user.role_id : 10;
+    const query = { ...req.query };
 
     const view = await View.findOne({ name: viewname });
     if (!view) {
       req.flash("danger", req.__(`No such view: %s`, text(viewname)));
       res.redirect("/");
-    } else if (
+      return;
+    }
+    view.rewrite_query_from_slug(query, req.params);
+
+    if (
       role > view.min_role &&
       !(await view.authorise_post({ body: req.body, req, ...view }))
     ) {
@@ -164,7 +170,7 @@ router.post(
         } does not supply a POST handler`
       );
     } else {
-      await view.runPost(req.query, req.body, { res, req });
+      await view.runPost(query, req.body, { res, req });
     }
   })
 );

package/routes/viewedit.js

@@ -232,12 +232,13 @@ const mapObjectValues = (o, f) =>
  * @param {object} values
  * @returns {Form}
  */
-const viewForm = (req, tableOptions, roles, pages, values) => {
+const viewForm = async (req, tableOptions, roles, pages, values) => {
   const isEdit =
     values && values.id && !getState().getConfig("development_mode", false);
   const hasTable = Object.entries(getState().viewtemplates)
     .filter(([k, v]) => !v.tableless)
     .map(([k, v]) => k);
+  const slugOptions = await Table.allSlugOptions();
   return new Form({
     action: "/viewedit/save",
     submitLabel: req.__("Configure") + " »",
@@ -302,6 +303,19 @@ const viewForm = (req, tableOptions, roles, pages, values) => {
           ...pages.map((p) => ({ value: p.name, label: p.name })),
         ],
       }),
+      new Field({
+        name: "slug",
+        label: req.__("Slug"),
+        sublabel: req.__("Field that can be used for a prettier URL structure"),
+        type: "String",
+        attributes: {
+          calcOptions: [
+            "table_name",
+            mapObjectValues(slugOptions, (lvs) => lvs.map((lv) => lv.label)),
+          ],
+        },
+        showIf: { viewtemplate: hasTable },
+      }),
       ...(isEdit
         ? [
             new Field({
@@ -342,10 +356,15 @@ router.get(
       (t) => t.id === viewrow.table_id || t.name === viewrow.exttable_name
     );
     viewrow.table_name = currentTable && currentTable.name;
+    if (viewrow.slug && currentTable) {
+      const slugOptions = await currentTable.slug_options();
+      const slug = slugOptions.find((so) => so.label === viewrow.slug.label);
+      if (slug) viewrow.slug = slug.label;
+    }
     const tableOptions = tables.map((t) => t.name);
     const roles = await User.get_roles();
     const pages = await Page.find();
-    const form = viewForm(req, tableOptions, roles, pages, viewrow);
+    const form = await viewForm(req, tableOptions, roles, pages, viewrow);
     form.hidden("id");
     res.sendWrap(req.__(`Edit view`), {
       above: [
@@ -380,7 +399,7 @@ router.get(
     const tableOptions = tables.map((t) => t.name);
     const roles = await User.get_roles();
     const pages = await Page.find();
-    const form = viewForm(req, tableOptions, roles, pages);
+    const form = await viewForm(req, tableOptions, roles, pages);
     if (req.query && req.query.table) {
       form.values.table_name = req.query.table;
     }
@@ -417,7 +436,7 @@ router.post(
     const tableOptions = tables.map((t) => t.name);
     const roles = await User.get_roles();
     const pages = await Page.find();
-    const form = viewForm(req, tableOptions, roles, pages);
+    const form = await viewForm(req, tableOptions, roles, pages);
     const result = form.validate(req.body);
 
     const sendForm = (form) => {
@@ -458,11 +477,18 @@ router.post(
         const v = result.success;
         if (v.table_name) {
           const table = await Table.findOne({ name: v.table_name });
-          if (table && table.id) v.table_id = table.id;
-          else if (table && table.external) v.exttable_name = v.table_name;
+          if (table && table.id) {
+            v.table_id = table.id;
+          } else if (table && table.external) v.exttable_name = v.table_name;
         }
+        if (v.table_id) {
+          const table = await Table.findOne({ id: v.table_id });
+          const slugOptions = await table.slug_options();
+          const slug = slugOptions.find((so) => so.label === v.slug);
+          v.slug = slug || null;
+        }
+        const table = await Table.findOne({ name: v.table_name });
         delete v.table_name;
-
         if (req.body.id) {
           await View.update(v, +req.body.id);
         } else {

package/serve.js

@@ -163,9 +163,6 @@ module.exports =
     ...appargs
   } = {}) => {
     if (dev && cluster.isMaster) {
-      spawnSync("npm", ["run", "tsc"], {
-        stdio: "inherit",
-      });
       listenForChanges(getRelevantPackages(), await getPluginDirectories());
     }
     const useNCpus = process.env.SALTCORN_NWORKERS