@saltcorn/server 0.9.5-beta.0 → 0.9.5-beta.10

package/auth/admin.js

@@ -82,6 +82,13 @@ const getUserFields = async (req) => {
   await iterForm("new_user_form");
   //console.log(userFields);
   for (const f of userFields) {
+    if (f.is_fkey && !f.fieldview) {
+      f.fieldviewObj = getState().keyFieldviews?.select;
+      if (f.fieldviewObj) {
+        f.input_type = "fromtype";
+        f.fieldview = "select";
+      }
+    }
     await f.fill_fkey_options();
     if (f.name === "email") {
       f.validator = (s) => {
@@ -357,6 +364,7 @@ const auth_settings_form = async (req) =>
       "user_settings_form",
       "verification_view",
       "logout_url",
+      "signup_role",
       "elevate_verified",
       "email_mask",
     ],

package/auth/routes.js

@@ -514,9 +514,13 @@ router.get(
       if (!signup_form) await defaultSignup();
       else {
         const resp = await signup_form.run_possibly_on_page({}, req, res);
-        if (signup_form.default_render_page)
-          res.sendWrap(req.__(`Sign up`), resp);
-        else res.sendAuthWrap(req.__(`Sign up`), resp, { methods: [] });
+        if (signup_form.default_render_page) {
+          const page = Page.findOne({ name: signup_form.default_render_page });
+          res.sendWrap(
+            { title: req.__(`Sign up`), no_menu: page?.attributes?.no_menu },
+            resp
+          );
+        } else res.sendAuthWrap(req.__(`Sign up`), resp, { methods: [] });
       }
     } else await defaultSignup();
   })
@@ -786,6 +790,7 @@ router.post(
         res.sendAuthWrap(new_user_form, form, getAuthLinks("signup", true));
         return;
       }
+      uobj.role_id = +getState().getConfig("signup_role", "80");
       const u = await User.create(uobj);
       await send_verification_email(u, req);
 
@@ -843,6 +848,7 @@ router.post(
         res.sendAuthWrap(new_user_form, form, getAuthLinks("signup", true));
       } else {
         try {
+          form.values.role_id = +getState().getConfig("signup_role", "80");
           const u = await User.create(form.values);
           await send_verification_email(u, req);
 
@@ -978,6 +984,7 @@ router.post(
             getAuthLinks("signup", true)
           );
         } else {
+          userObject.role_id = +getState().getConfig("signup_role", "80");
           const u = await User.create(userObject);
           await send_verification_email(u, req);
 
@@ -1010,6 +1017,7 @@ router.post(
         form.values.password = password;
         res.sendAuthWrap(new_user_form, form, getAuthLinks("signup", true));
       } else {
+        form.values.role_id = +getState().getConfig("signup_role", "80");
         const u = await User.create(form.values);
         await send_verification_email(u, req);
         if (req.smr)

package/errors.js

@@ -37,6 +37,7 @@ module.exports =
     const createCrash = severity <= 3;
     //console.error(err.stack);
     if (!(devmode && log_sql) && createCrash) await Crash.create(err, req);
+    else console.error(err);
 
     if (req.xhr) {
       res

package/help/Cordova Builder.tmd

@@ -0,0 +1,13 @@
+The Cordova builder is a docker image with all dependencies to build Android apps.
+It can be pulled from dockerhub while installing Saltcorn, or you can use the pull button.
+
+Please make sure your server has a valid and accessible docker daemon running. 
+
+For this, either set up a standard docker installation 
+or use the [docker rootless mode](https://docs.docker.com/engine/security/rootless/) (recommended).
+
+In a standard docker environment, you need root user privileges. 
+For this, you can add the user running Saltcorn to the docker group, 
+or if you already have the privileges, you are ready to go.
+
+A docker daemon in rootless mode doesn't need any further configuration.

package/load_plugins.js

@@ -6,59 +6,10 @@
  * @module load_plugins
  */
 const db = require("@saltcorn/data/db");
-const { PluginManager } = require("live-plugin-manager");
 const { getState, getRootState } = require("@saltcorn/data/db/state");
 const Plugin = require("@saltcorn/data/models/plugin");
-const fs = require("fs");
-const proc = require("child_process");
-const tmp = require("tmp-promise");
 
-const staticDependencies = {
-  "@saltcorn/markup": require("@saltcorn/markup"),
-  "@saltcorn/markup/tags": require("@saltcorn/markup/tags"),
-  "@saltcorn/markup/layout": require("@saltcorn/markup/layout"),
-  "@saltcorn/markup/helpers": require("@saltcorn/markup/helpers"),
-  "@saltcorn/markup/layout_utils": require("@saltcorn/markup/layout_utils"),
-  "@saltcorn/data": require("@saltcorn/data"),
-  "@saltcorn/data/db": require("@saltcorn/data/db"),
-  "@saltcorn/data/utils": require("@saltcorn/data/utils"),
-  "@saltcorn/data/db/state": require("@saltcorn/data/db/state"),
-  "@saltcorn/data/plugin-helper": require("@saltcorn/data/plugin-helper"),
-  "@saltcorn/data/plugin-testing": require("@saltcorn/data/plugin-testing"),
-  "@saltcorn/data/models/field": require("@saltcorn/data/models/field"),
-  "@saltcorn/data/models/fieldrepeat": require("@saltcorn/data/models/fieldrepeat"),
-  "@saltcorn/data/models/table": require("@saltcorn/data/models/table"),
-  "@saltcorn/data/models/form": require("@saltcorn/data/models/form"),
-  "@saltcorn/data/models/discovery": require("@saltcorn/data/models/discovery"),
-  "@saltcorn/data/models/config": require("@saltcorn/data/models/config"),
-  "@saltcorn/data/models/library": require("@saltcorn/data/models/library"),
-  "@saltcorn/data/models/model": require("@saltcorn/data/models/model"),
-  "@saltcorn/data/models/model_instance": require("@saltcorn/data/models/model_instance"),
-  "@saltcorn/data/models/notification": require("@saltcorn/data/models/notification"),
-  "@saltcorn/data/models/role": require("@saltcorn/data/models/role"),
-  "@saltcorn/data/models/tag": require("@saltcorn/data/models/tag"),
-  "@saltcorn/data/models/tag_entry": require("@saltcorn/data/models/tag_entry"),
-  "@saltcorn/data/models/view": require("@saltcorn/data/models/view"),
-  "@saltcorn/data/models/page": require("@saltcorn/data/models/page"),
-  "@saltcorn/data/models/file": require("@saltcorn/data/models/file"),
-  "@saltcorn/data/models/user": require("@saltcorn/data/models/user"),
-  "@saltcorn/data/models/layout": require("@saltcorn/data/models/layout"),
-  "@saltcorn/data/models/expression": require("@saltcorn/data/models/expression"),
-  "@saltcorn/data/models/workflow": require("@saltcorn/data/models/workflow"),
-  imapflow: require("imapflow"),
-  "node-fetch": require("node-fetch"),
-};
-
-/**
- * Create plugin manager with default list of core plugins
- * @type {PluginManager}
- */
-const defaultManager = new PluginManager({
-  staticDependencies: {
-    contractis: require("contractis"),
-    ...staticDependencies,
-  },
-});
+const PluginInstaller = require("@saltcorn/plugins-loader/plugin_installer");
 
 /**
  * Load one plugin
@@ -68,19 +19,35 @@ const defaultManager = new PluginManager({
  */
 const loadPlugin = async (plugin, force) => {
   // load plugin
-  const res = await requirePlugin(plugin, force);
+  const loader = new PluginInstaller(plugin);
+  const res = await loader.install(force);
   const configuration =
     typeof plugin.configuration === "string"
       ? JSON.parse(plugin.configuration)
       : plugin.configuration;
-  // register plugin
-  getState().registerPlugin(
-    res.plugin_module.plugin_name || plugin.name,
-    res.plugin_module,
-    configuration,
-    res.location,
-    res.name
-  );
+  try {
+    // register plugin
+    getState().registerPlugin(
+      res.plugin_module.plugin_name || plugin.name,
+      res.plugin_module,
+      configuration,
+      res.location,
+      res.name
+    );
+  } catch (error) {
+    if (force) {
+      // remove the install dir and try again
+      await loader.remove();
+      await loader.install(force);
+      getState().registerPlugin(
+        res.plugin_module.plugin_name || plugin.name,
+        res.plugin_module,
+        configuration,
+        res.location,
+        res.name
+      );
+    }
+  }
   if (res.plugin_module.onLoad) {
     try {
       await res.plugin_module.onLoad(plugin.configuration);
@@ -91,105 +58,48 @@ const loadPlugin = async (plugin, force) => {
   return res;
 };
 
-/**
- * Git pull or clone
- * @param plugin
- */
-const gitPullOrClone = async (plugin) => {
-  await fs.promises.mkdir("git_plugins", { recursive: true });
-  let keyfnm,
-    setKey = `-c core.sshCommand="ssh -oBatchMode=yes -o 'StrictHostKeyChecking no'" `;
-  if (plugin.deploy_private_key) {
-    keyfnm = await tmp.tmpName();
-    await fs.promises.writeFile(
-      keyfnm,
-      plugin.deploy_private_key.replace(/[\r]+/g, "") + "\n",
-      {
-        mode: 0o600,
-        encoding: "ascii",
-      }
-    );
-    setKey = `-c core.sshCommand="ssh -oBatchMode=yes -o 'StrictHostKeyChecking no' -i ${keyfnm}" `;
-  }
-  const dir = `git_plugins/${plugin.name}`;
-  if (fs.existsSync(dir)) {
-    proc.execSync(`git ${setKey} -C ${dir} pull`);
-  } else {
-    proc.execSync(`git ${setKey} clone ${plugin.location} ${dir}`);
-  }
-  if (plugin.deploy_private_key) await fs.promises.unlink(keyfnm);
-  return dir;
-};
 /**
  * Install plugin
  * @param plugin - plugin name
  * @param force - force flag
- * @param manager - plugin manager
  * @returns {Promise<{plugin_module: *}|{plugin_module: any}>}
  */
-const requirePlugin = async (plugin, force, manager = defaultManager) => {
-  const installed_plugins = (await manager.list()).map((p) => p.name);
-  // todo as idea is to make list of mandatory plugins configurable
-  if (
-    ["@saltcorn/base-plugin", "@saltcorn/sbadmin2"].includes(plugin.location)
-  ) {
-    return { plugin_module: require(plugin.location) };
-  } else if (plugin.source === "npm") {
-    if (force || !installed_plugins.includes(plugin.location)) {
-      const plinfo = await manager.install(plugin.location, plugin.version);
-      return { plugin_module: manager.require(plugin.location), ...plinfo };
-    } else {
-      const plinfo = manager.getInfo(plugin.location);
-      return { plugin_module: manager.require(plugin.location), ...plinfo };
-    }
-  } else if (plugin.source === "local") {
-    const plinfo = await manager.installFromPath(plugin.location, {
-      force: true,
-    });
-    return { plugin_module: manager.require(plugin.name), ...plinfo };
-  } else if (plugin.source === "git") {
-    const loc = await gitPullOrClone(plugin);
-    const plinfo = await manager.installFromPath(loc, {
-      force: true,
-    });
-    return { plugin_module: manager.require(plugin.name), ...plinfo };
-  } else if (plugin.source === "github") {
-    if (force || !installed_plugins.includes(plugin.location)) {
-      const plinfo = await manager.installFromGithub(plugin.location, {
-        force: true,
-      });
-      return { plugin_module: manager.require(plugin.name), ...plinfo };
-    } else {
-      const plinfo = manager.getInfo(plugin.location);
-      return { plugin_module: manager.require(plugin.location), ...plinfo };
-    }
-  } else throw new Error("Unknown plugin source: " + plugin.source);
+const requirePlugin = async (plugin, force) => {
+  const loader = new PluginInstaller(plugin);
+  return await loader.install(force);
 };
+
 /**
  * Load all plugins
  * @returns {Promise<void>}
  */
-const loadAllPlugins = async () => {
+const loadAllPlugins = async (force) => {
   await getState().refresh(true);
   const plugins = await db.select("_sc_plugins");
   for (const plugin of plugins) {
     try {
-      await loadPlugin(plugin);
+      await loadPlugin(plugin, force);
     } catch (e) {
       console.error(e);
     }
   }
   await getState().refresh(true);
 };
+
 /**
  * Load Plugin and its dependencies and save into local installation
  * @param plugin
  * @param force
  * @param noSignalOrDB
- * @param manager - optional plugin manager
+ * @param __ translation function
  * @returns {Promise<void>}
  */
-const loadAndSaveNewPlugin = async (plugin, force, noSignalOrDB, manager) => {
+const loadAndSaveNewPlugin = async (
+  plugin,
+  force,
+  noSignalOrDB,
+  __ = (str) => str
+) => {
   const tenants_unsafe_plugins = getRootState().getConfig(
     "tenants_unsafe_plugins",
     false
@@ -215,11 +125,10 @@ const loadAndSaveNewPlugin = async (plugin, force, noSignalOrDB, manager) => {
       return;
     }
   }
-  const { version, plugin_module, location } = await requirePlugin(
-    plugin,
-    force,
-    manager
-  );
+  const msgs = [];
+  const loader = new PluginInstaller(plugin);
+  const { version, plugin_module, location, loadedWithReload } =
+    await loader.install(force);
 
   // install dependecies
   for (const loc of plugin_module.dependencies || []) {
@@ -232,13 +141,43 @@ const loadAndSaveNewPlugin = async (plugin, force, noSignalOrDB, manager) => {
       );
     }
   }
-  getState().registerPlugin(
-    plugin_module.plugin_name || plugin.name,
-    plugin_module,
-    plugin.configuration,
-    location,
-    plugin.name
-  );
+  let registeredWithReload = false;
+  try {
+    getState().registerPlugin(
+      plugin_module.plugin_name || plugin.name,
+      plugin_module,
+      plugin.configuration,
+      location,
+      plugin.name
+    );
+  } catch (error) {
+    if (force) {
+      getState().log(
+        2,
+        `Error registering plugin ${plugin.name}. Removing and trying again.`
+      );
+      await loader.remove();
+      await loader.install(force);
+      getState().registerPlugin(
+        plugin_module.plugin_name || plugin.name,
+        plugin_module,
+        plugin.configuration,
+        location,
+        plugin.name
+      );
+      registeredWithReload = true;
+    } else {
+      throw error;
+    }
+  }
+  if (loadedWithReload || registeredWithReload) {
+    msgs.push(
+      __(
+        "The plugin was corrupted and had to be repaired. We recommend restarting your server.",
+        plugin.name
+      )
+    );
+  }
   if (plugin_module.onLoad) {
     try {
       await plugin_module.onLoad(plugin.configuration);
@@ -252,9 +191,10 @@ const loadAndSaveNewPlugin = async (plugin, force, noSignalOrDB, manager) => {
     getState().processSend({
       installPlugin: plugin,
       tenant: db.getTenantSchema(),
-      force,
+      force: false, // okay ??
     });
   }
+  return msgs;
 };
 
 module.exports = {
@@ -262,5 +202,4 @@ module.exports = {
   loadAllPlugins,
   loadPlugin,
   requirePlugin,
-  staticDependencies,
 };

package/locales/en.json

@@ -1382,5 +1382,14 @@
 	"Open a connection to TLS server with self-signed or invalid TLS certificate": "Open a connection to TLS server with self-signed or invalid TLS certificate",
 	"Allow self-signed": "Allow self-signed",
 	"Optionally associate a table with this trigger": "Optionally associate a table with this trigger",
-	"Delete table": "Delete table"
-}
+	"Delete table": "Delete table",
+	"Signup role": "Signup role",
+	"The initial role of signed up users": "The initial role of signed up users",
+	"Cordova builder": "Cordova builder",
+	"not available": "not available",
+	"pull": "pull",
+	"refresh": "refresh",
+	"installed": "installed",
+	"Include table history in backup": "Include table history in backup",
+	"The plugin was corrupted and had to be repaired. We recommend restarting your server.": "The plugin was corrupted and had to be repaired. We recommend restarting your server."
+}

package/markup/admin.js

@@ -23,6 +23,8 @@ const Form = require("@saltcorn/data/models/form");
 const Table = require("@saltcorn/data/models/table");
 const View = require("@saltcorn/data/models/view");
 const User = require("@saltcorn/data/models/user");
+const FieldRepeat = require("@saltcorn/data/models/fieldrepeat");
+const Field = require("@saltcorn/data/models/field");
 
 /**
  * Restore Backup
@@ -437,6 +439,26 @@ const config_fields_form = async ({
     const label = configTypes[name].label || name;
     const sublabel = configTypes[name].sublabel || configTypes[name].blurb;
 
+    if (configTypes[name].type === "Repeat") {
+      const repFields = configTypes[name].fields;
+      const filledFields = [];
+      for (const rfield of repFields) {
+        const fillField = new Field(rfield);
+        await fillField.fill_fkey_options();
+        filledFields.push(fillField);
+      }
+      fields.push(
+        new FieldRepeat({
+          name,
+          label,
+          fields: filledFields,
+          showIf,
+        })
+      );
+
+      continue;
+    }
+
     fields.push({
       name,
       ...configTypes[name],

package/package.json

@@ -1,19 +1,20 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.9.5-beta.0",
+  "version": "0.9.5-beta.10",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
     "@aws-sdk/client-s3": "^3.451.0",
-    "@saltcorn/base-plugin": "0.9.5-beta.0",
-    "@saltcorn/builder": "0.9.5-beta.0",
-    "@saltcorn/data": "0.9.5-beta.0",
-    "@saltcorn/admin-models": "0.9.5-beta.0",
-    "@saltcorn/filemanager": "0.9.5-beta.0",
-    "@saltcorn/markup": "0.9.5-beta.0",
-    "@saltcorn/sbadmin2": "0.9.5-beta.0",
+    "@saltcorn/base-plugin": "0.9.5-beta.10",
+    "@saltcorn/builder": "0.9.5-beta.10",
+    "@saltcorn/data": "0.9.5-beta.10",
+    "@saltcorn/admin-models": "0.9.5-beta.10",
+    "@saltcorn/filemanager": "0.9.5-beta.10",
+    "@saltcorn/markup": "0.9.5-beta.10",
+    "@saltcorn/plugins-loader": "0.9.5-beta.10",
+    "@saltcorn/sbadmin2": "0.9.5-beta.10",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",
@@ -26,6 +27,7 @@
     "cors": "2.8.5",
     "csurf": "^1.11.0",
     "csv-stringify": "^5.5.0",
+    "dockerode": "~4.0.2",
     "express": "^4.17.1",
     "express-fileupload": "^1.1.8",
     "express-promise-router": "^3.0.3",
@@ -37,7 +39,6 @@
     "i18n": "^0.15.1",
     "imapflow": "1.0.123",
     "jsonwebtoken": "^9.0.0",
-    "live-plugin-manager": "^0.17.1",
     "markdown-it": "^13.0.2",
     "moment": "^2.29.4",
     "multer": "1.4.5-lts.1",
@@ -70,8 +71,8 @@
   },
   "repository": "github:saltcorn/saltcorn",
   "devDependencies": {
-    "jest": "26.6.3",
-    "jest-environment-jsdom": "^26.6.2",
+    "jest": "^28.1.3",
+    "jest-environment-jsdom": "28.1.3",
     "supertest": "^6.3.3"
   },
   "scripts": {
@@ -84,11 +85,13 @@
     "testEnvironment": "node",
     "testPathIgnorePatterns": [
       "/node_modules/",
-      "/plugin_packages/"
+      "/plugin_packages/",
+      "/plugins_folder/"
     ],
     "coveragePathIgnorePatterns": [
       "/node_modules/",
-      "/plugin_packages/"
+      "/plugin_packages/",
+      "/plugins_folder/"
     ],
     "moduleNameMapper": {
       "@saltcorn/sqlite/(.*)": "<rootDir>/../sqlite/dist/$1",