@saltcorn/server 1.1.0-beta.0 → 1.1.0-beta.1

package/locales/en.json

@@ -1490,5 +1490,8 @@
 	"Login and signup views should be accessible by public users": "Login and signup views should be accessible by public users",
 	"Shared: %s": "Shared: %s",
 	"Sharing not enabled": "Sharing not enabled",
-	"You must be logged in to share": "You must be logged in to share"
+	"You must be logged in to share": "You must be logged in to share",
+	"Fluid layout": "Fluid layout",
+	"Request fluid layout from theme for a wider display for this page": "Request fluid layout from theme for a wider display for this page",
+	"Location of view to create new row": "Location of view to create new row"
 }

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "@saltcorn/server",
-  "version": "1.1.0-beta.0",
+  "version": "1.1.0-beta.1",
   "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": "1.1.0-beta.0",
-    "@saltcorn/builder": "1.1.0-beta.0",
-    "@saltcorn/data": "1.1.0-beta.0",
-    "@saltcorn/admin-models": "1.1.0-beta.0",
-    "@saltcorn/filemanager": "1.1.0-beta.0",
-    "@saltcorn/markup": "1.1.0-beta.0",
-    "@saltcorn/plugins-loader": "1.1.0-beta.0",
-    "@saltcorn/sbadmin2": "1.1.0-beta.0",
+    "@saltcorn/base-plugin": "1.1.0-beta.1",
+    "@saltcorn/builder": "1.1.0-beta.1",
+    "@saltcorn/data": "1.1.0-beta.1",
+    "@saltcorn/admin-models": "1.1.0-beta.1",
+    "@saltcorn/filemanager": "1.1.0-beta.1",
+    "@saltcorn/markup": "1.1.0-beta.1",
+    "@saltcorn/plugins-loader": "1.1.0-beta.1",
+    "@saltcorn/sbadmin2": "1.1.0-beta.1",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",

package/routes/admin.js

@@ -12,6 +12,7 @@ const {
   setTenant,
   admin_config_route,
   get_sys_info,
+  tenant_letsencrypt_name,
 } = require("./utils.js");
 const Table = require("@saltcorn/data/models/table");
 const Plugin = require("@saltcorn/data/models/plugin");
@@ -90,7 +91,10 @@ const {
 } = require("../markup/admin.js");
 const packagejson = require("../package.json");
 const Form = require("@saltcorn/data/models/form");
-const { get_latest_npm_version } = require("@saltcorn/data/models/config");
+const {
+  get_latest_npm_version,
+  isFixedConfig,
+} = require("@saltcorn/data/models/config");
 const { getMailTransport } = require("@saltcorn/data/models/email");
 const {
   getBaseDomain,
@@ -976,6 +980,40 @@ router.post(
     }
   })
 );
+
+router.post(
+  "/save-config",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const state = getState();
+
+    //TODO check this is a config key
+    const validKeyName = (k) =>
+      k !== "_csrf" && k !== "constructor" && k !== "__proto__";
+
+    for (const [k, v] of Object.entries(req.body)) {
+      if (!isFixedConfig(k) && typeof v !== "undefined" && validKeyName(k)) {
+        //TODO read value from type
+        await state.setConfig(k, v);
+      }
+    }
+
+    // checkboxes that are false are not sent in post body. Check here
+    const { boolcheck } = req.query;
+    const boolchecks =
+      typeof boolcheck === "undefined"
+        ? []
+        : Array.isArray(boolcheck)
+        ? boolcheck
+        : [boolcheck];
+    for (const k of boolchecks) {
+      if (typeof req.body[k] === "undefined" && validKeyName(k))
+        await state.setConfig(k, false);
+    }
+    res.json({ success: "ok" });
+  })
+);
+
 /**
  * Do Auto backup now
  */
@@ -1689,6 +1727,64 @@ const clearAllForm = (req) =>
     ],
   });
 
+router.post(
+  "/acq-ssl-tenant/:subdomain",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    if (
+      db.is_it_multi_tenant() &&
+      db.getTenantSchema() === db.connectObj.default_schema
+    ) {
+      const { subdomain } = req.params;
+
+      const domain = getBaseDomain();
+
+      let altname = await tenant_letsencrypt_name(subdomain);
+
+      if (!altname || domain) {
+        req.json({ error: "Set Base URL for both tenant and root first." });
+        return;
+      }
+
+      try {
+        const file_store = db.connectObj.file_store;
+        const admin_users = await User.find({ role_id: 1 }, { orderBy: "id" });
+        // greenlock logic
+        const Greenlock = require("greenlock");
+        const greenlock = Greenlock.create({
+          packageRoot: path.resolve(__dirname, ".."),
+          configDir: path.join(file_store, "greenlock.d"),
+          maintainerEmail: admin_users[0].email,
+        });
+
+        await greenlock.sites.add({
+          subject: altname,
+        });
+        // letsencrypt
+        const tenant_letsencrypt_sites = getState().getConfig(
+          "tenant_letsencrypt_sites",
+          []
+        );
+        await getState().setConfig(tenant_letsencrypt_sites, [
+          altname,
+          ...tenant_letsencrypt_sites,
+        ]);
+
+        res.json({
+          success: true,
+          notify: "Certificate added, please restart server",
+        });
+      } catch (e) {
+        req.flash("error", e.message);
+        res.redirect("/useradmin/ssl");
+      }
+    } else {
+      req.flash("error", req.__("Not possible for tenant"));
+      res.redirect("/useradmin/ssl");
+    }
+  })
+);
+
 /**
  * Do Enable letsencrypt
  * @name post/enable-letsencrypt
@@ -1749,6 +1845,15 @@ router.post(
         });
         // letsencrypt
         await getState().setConfig("letsencrypt", true);
+        const tenant_letsencrypt_sites = getState().getConfig(
+          "tenant_letsencrypt_sites",
+          []
+        );
+        await getState().setConfig(tenant_letsencrypt_sites, [
+          ...altnames,
+          ...tenant_letsencrypt_sites,
+        ]);
+
         req.flash(
           "success",
           req.__(

package/routes/page.js

@@ -66,6 +66,7 @@ const runPage = async (page, req, res, tic) => {
           description: page.description,
           bodyClass: "page_" + db.sqlsanitize(page.name),
           no_menu: page.attributes?.no_menu,
+          requestFluidLayout: page.attributes?.request_fluid_layout,
         } || `${page.name} page`,
         add_edit_bar({
           role,

package/routes/pageedit.js

@@ -143,6 +143,12 @@ const pagePropertiesForm = async (req, isNew) => {
         sublabel: req.__("Omit the menu from this page"),
         type: "Bool",
       },
+      {
+        name: "request_fluid_layout",
+        label: req.__("Fluid layout"),
+        sublabel: req.__("Request fluid layout from theme for a wider display for this page"),
+        type: "Bool",
+      },
     ],
   });
   return form;
@@ -429,6 +435,7 @@ router.get(
       form.hidden("id");
       form.values = page;
       form.values.no_menu = page.attributes?.no_menu;
+      form.values.request_fluid_layout = page.attributes?.request_fluid_layout;
       form.onChange = `saveAndContinue(this)`;
       res.sendWrap(
         req.__(`Page attributes`),
@@ -475,9 +482,16 @@ router.post(
         wrap(renderForm(form, req.csrfToken()), false, req)
       );
     } else {
-      const { id, columns, no_menu, html_file, ...pageRow } = form.values;
+      const {
+        id,
+        columns,
+        no_menu,
+        request_fluid_layout,
+        html_file,
+        ...pageRow
+      } = form.values;
       pageRow.min_role = +pageRow.min_role;
-      pageRow.attributes = { no_menu };
+      pageRow.attributes = { no_menu, request_fluid_layout };
       if (html_file) {
         pageRow.layout = {
           html_file: html_file,

package/routes/tenant.js

@@ -44,7 +44,12 @@ const {
 const db = require("@saltcorn/data/db");
 
 const { loadAllPlugins, loadAndSaveNewPlugin } = require("../load_plugins");
-const { isAdmin, error_catcher, is_ip_address } = require("./utils.js");
+const {
+  isAdmin,
+  error_catcher,
+  is_ip_address,
+  tenant_letsencrypt_name,
+} = require("./utils.js");
 const User = require("@saltcorn/data/models/user");
 const File = require("@saltcorn/data/models/file");
 const {
@@ -612,8 +617,18 @@ router.get(
       return;
     }
     const { subdomain } = req.params;
+
     // get tenant info
     const info = await get_tenant_info(subdomain);
+    const letsencrypt = getState().getConfig("letsencrypt", false);
+
+    let altname = await tenant_letsencrypt_name(subdomain);
+    const tenant_letsencrypt_sites = getState().getConfig(
+      "tenant_letsencrypt_sites",
+      []
+    );
+    const has_cert = tenant_letsencrypt_sites.includes(altname);
+    
     // get list of files
     let files;
     await db.runWithTenant(subdomain, async () => {
@@ -632,6 +647,7 @@ router.get(
             // TBD make more pretty view - in ideal with charts
             contents: [
               table(
+                { class: "table table-sm" },
                 tr(
                   th(req.__("First user E-mail")),
                   td(
@@ -723,6 +739,20 @@ router.get(
                   submitLabel: req.__("Save"),
                   submitButtonClass: "btn-outline-primary",
                   onChange: "remove_outline(this)",
+                  additionalButtons: [
+                    ...(letsencrypt && !has_cert
+                      ? [
+                          {
+                            label: req.__("Acquire LetsEncrypt certificate"),
+                            id: "btnAcqCert",
+                            class: "btn btn-secondary",
+                            onclick: `press_store_button(this);ajax_post('/admin/acq-ssl-tenant/${encodeURIComponent(
+                              subdomain
+                            )}')`,
+                          },
+                        ]
+                      : []),
+                  ],
                   fields: [
                     {
                       name: "base_url",

package/routes/utils.js

@@ -33,6 +33,7 @@ const {
 const path = require("path");
 const { UAParser } = require("ua-parser-js");
 const crypto = require("crypto");
+const { domain_sanitize } = require("@saltcorn/admin-models/models/tenant");
 
 const get_sys_info = async () => {
   const disks = await si.fsSize();
@@ -372,6 +373,19 @@ const is_ip_address = (hostname) => {
   return hostname.split(".").every((s) => +s >= 0 && +s <= 255);
 };
 
+const tenant_letsencrypt_name = async (subdomain) => {
+  const saneDomain = domain_sanitize(subdomain);
+  let altname;
+  await db.runWithTenant(saneDomain, async () => {
+    altname = getState()
+      .getConfig("base_url", "")
+      .replace("https://", "")
+      .replace("http://", "")
+      .replace("/", "");
+  });
+  return altname;
+};
+
 const admin_config_route = ({
   router,
   path,
@@ -587,4 +601,5 @@ module.exports = {
   setRole,
   getEligiblePage,
   getRandomPage,
+  tenant_letsencrypt_name,
 };

package/tests/plugin_install.test.js

@@ -161,7 +161,7 @@ describe("Stable versioning install", () => {
       name: "@christianhugoch/empty_sc_test_plugin",
     });
     expect(dbPlugin).not.toBe(null);
-    expect(dbPlugin.version).toBe("0.1.0");
+    expect(dbPlugin.version).toBe("0.0.1");
   });
 
   it("installs a fixed version", async () => {
@@ -178,7 +178,7 @@ describe("Stable versioning install", () => {
       name: "@christianhugoch/empty_sc_test_plugin",
     });
     expect(dbPlugin).not.toBe(null);
-    expect(dbPlugin.version).toBe("0.1.0");
+    expect(dbPlugin.version).toBe("0.0.1");
   });
 
   it("installs and downgrades a fixed version", async () => {
@@ -196,7 +196,7 @@ describe("Stable versioning install", () => {
       name: "@christianhugoch/empty_sc_test_plugin",
     });
     expect(dbPlugin).not.toBe(null);
-    expect(dbPlugin.version).toBe("0.0.6");
+    expect(dbPlugin.version).toBe("0.0.1");
   });
 });
 
@@ -276,7 +276,7 @@ describe("Stable versioning upgrade", () => {
       name: "@christianhugoch/empty_sc_test_plugin",
     });
     expect(newPlugin).not.toBe(null);
-    expect(newPlugin.version).toBe("0.1.0");
+    expect(newPlugin.version).toBe("0.0.1");
   });
 
   it("upgrades to fixed version", async () => {
@@ -344,6 +344,6 @@ describe("Stable versioning upgrade", () => {
       name: "@christianhugoch/empty_sc_test_plugin",
     });
     expect(newPlugin).not.toBe(null);
-    expect(newPlugin.version).toBe("0.0.6");
+    expect(newPlugin.version).toBe("0.0.1");
   });
 });

package/tests/plugins.test.js

@@ -404,7 +404,7 @@ describe("Upgrade plugin to supported version", () => {
     const upgradedPlugin = await Plugin.findOne({
       name: "@christianhugoch/empty_sc_test_plugin",
     });
-    expect(upgradedPlugin.version).toBe("0.1.0");
+    expect(upgradedPlugin.version).toBe("0.0.1");
   });
 
   it("upgrades with a downgrade of the most current fixed version", async () => {
@@ -427,7 +427,7 @@ describe("Upgrade plugin to supported version", () => {
     const upgradedPlugin = await Plugin.findOne({
       name: "@christianhugoch/empty_sc_test_plugin",
     });
-    expect(upgradedPlugin.version).toBe("0.1.0");
+    expect(upgradedPlugin.version).toBe("0.0.1");
   });
 });