@saltcorn/server 1.1.0-beta.7 → 1.1.0-beta.9

package/package.json

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

package/routes/admin.js

@@ -1741,8 +1741,8 @@ router.post(
 
       let altname = await tenant_letsencrypt_name(subdomain);
 
-      if (!altname || domain) {
-        req.json({ error: "Set Base URL for both tenant and root first." });
+      if (!altname || !domain) {
+        res.json({ error: "Set Base URL for both tenant and root first." });
         return;
       }
 
@@ -1759,13 +1759,14 @@ router.post(
 
         await greenlock.sites.add({
           subject: altname,
+          altnames: [altname],
         });
         // letsencrypt
         const tenant_letsencrypt_sites = getState().getConfig(
           "tenant_letsencrypt_sites",
           []
         );
-        await getState().setConfig(tenant_letsencrypt_sites, [
+        await getState().setConfig("tenant_letsencrypt_sites", [
           altname,
           ...tenant_letsencrypt_sites,
         ]);
@@ -1775,12 +1776,10 @@ router.post(
           notify: "Certificate added, please restart server",
         });
       } catch (e) {
-        req.flash("error", e.message);
-        res.redirect("/useradmin/ssl");
+        res.json({ error: e.message });
       }
     } else {
-      req.flash("error", req.__("Not possible for tenant"));
-      res.redirect("/useradmin/ssl");
+      res.json({ error: req.__("Not possible for tenant") });
     }
   })
 );
@@ -1849,7 +1848,7 @@ router.post(
           "tenant_letsencrypt_sites",
           []
         );
-        await getState().setConfig(tenant_letsencrypt_sites, [
+        await getState().setConfig("tenant_letsencrypt_sites", [
           ...altnames,
           ...tenant_letsencrypt_sites,
         ]);

package/routes/tenant.js

@@ -58,6 +58,7 @@ const {
   save_config_from_form,
 } = require("../markup/admin.js");
 const { getConfig } = require("@saltcorn/data/models/config");
+const path = require("path");
 //const {quote} = require("@saltcorn/db-common");
 // todo add button backup / restore for particular tenant (available in admin tenants screens)
 //const {
@@ -318,7 +319,48 @@ router.post(
         if (hasTemplate) {
           new_url_create += "auth/create_first_user";
         }
-
+        const letsencrypt = getState().getConfig("letsencrypt", false);
+        if (letsencrypt) {
+          let altname = await tenant_letsencrypt_name(subdomain);
+          const tenant_letsencrypt_sites = getState().getConfig(
+            "tenant_letsencrypt_sites",
+            []
+          );
+          const has_cert = tenant_letsencrypt_sites.includes(altname);
+          if (!has_cert) {
+            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,
+              altnames: [altname],
+            });
+            // letsencrypt
+            const tenant_letsencrypt_sites = getState().getConfig(
+              "tenant_letsencrypt_sites",
+              []
+            );
+            await getState().setConfig("tenant_letsencrypt_sites", [
+              altname,
+              ...tenant_letsencrypt_sites,
+            ]);
+            if (req.user?.role_id === 1) {
+              req.flash("success", req.__("Tenant created. Certificate will be acquired on first visit."));
+              res.redirect("/tenant/list");
+              return;
+            }
+          }
+        }
         res.sendWrap(
           req.__("Create application"),
           div(
@@ -628,7 +670,7 @@ router.get(
       []
     );
     const has_cert = tenant_letsencrypt_sites.includes(altname);
-    
+
     // get list of files
     let files;
     await db.runWithTenant(subdomain, async () => {

package/tests/plugin_install.test.js

@@ -161,10 +161,10 @@ describe("Stable versioning install", () => {
       name: "@christianhugoch/empty_sc_test_plugin",
     });
     expect(dbPlugin).not.toBe(null);
-    expect(dbPlugin.version).toBe("0.0.1");
+    expect(dbPlugin.version).toBe("0.1.0");
   });
 
-  it("installs a fixed version", async () => {
+  it("installs and upgrades a fixed version", async () => {
     const loadAndSaveNewPlugin = load_plugins.loadAndSaveNewPlugin;
     await loadAndSaveNewPlugin(
       new Plugin({
@@ -178,7 +178,7 @@ describe("Stable versioning install", () => {
       name: "@christianhugoch/empty_sc_test_plugin",
     });
     expect(dbPlugin).not.toBe(null);
-    expect(dbPlugin.version).toBe("0.0.1");
+    expect(dbPlugin.version).toBe("0.1.0");
   });
 
   it("installs and downgrades a fixed version", async () => {
@@ -188,7 +188,7 @@ describe("Stable versioning install", () => {
         name: "@christianhugoch/empty_sc_test_plugin",
         location: "@christianhugoch/empty_sc_test_plugin",
         source: "npm",
-        version: "0.0.6",
+        version: "0.2.0",
       }),
       true
     );
@@ -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.1");
+    expect(dbPlugin.version).toBe("0.1.0");
   });
 });
 
@@ -245,7 +245,7 @@ describe("Stable versioning upgrade", () => {
     expect(newPlugin.version).toBe("0.0.3");
   });
 
-  it("upgrades to latest with downgrade", async () => {
+  it("upgrades to latest with downgrade to supported", async () => {
     const loadAndSaveNewPlugin = load_plugins.loadAndSaveNewPlugin;
     await loadAndSaveNewPlugin(
       new Plugin({
@@ -276,7 +276,7 @@ describe("Stable versioning upgrade", () => {
       name: "@christianhugoch/empty_sc_test_plugin",
     });
     expect(newPlugin).not.toBe(null);
-    expect(newPlugin.version).toBe("0.0.1");
+    expect(newPlugin.version).toBe("0.1.0");
   });
 
   it("upgrades to fixed version", async () => {
@@ -313,7 +313,7 @@ describe("Stable versioning upgrade", () => {
     expect(newPlugin.version).toBe("0.0.3");
   });
 
-  it("upgrades to fixed version with downgrade", async () => {
+  it("upgrades to fixed version with downgrade to supported", async () => {
     const loadAndSaveNewPlugin = load_plugins.loadAndSaveNewPlugin;
     await loadAndSaveNewPlugin(
       new Plugin({
@@ -336,7 +336,7 @@ describe("Stable versioning upgrade", () => {
         name: "@christianhugoch/empty_sc_test_plugin",
         location: "@christianhugoch/empty_sc_test_plugin",
         source: "npm",
-        version: "0.0.6",
+        version: "0.2.0",
       }),
       true
     );
@@ -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.1");
+    expect(newPlugin.version).toBe("0.1.0");
   });
 });

package/tests/plugins.test.js

@@ -365,7 +365,7 @@ describe("Upgrade plugin to supported version", () => {
     expect(upgradedPlugin.version).toBe("0.0.3");
   });
 
-  it("upgrades to the most current fixed version", async () => {
+  it("upgrades to latest as fixed version", async () => {
     const oldPlugin = await setupPluginVersion(
       "@christianhugoch/empty_sc_test_plugin_two",
       "0.0.1"
@@ -389,7 +389,7 @@ describe("Upgrade plugin to supported version", () => {
     expect(upgradedPlugin.version).toBe("0.0.3");
   });
 
-  it("upgrades with a downgrade of the latest version", async () => {
+  it("upgrades with a downgrade of latest", async () => {
     const oldPlugin = await setupPluginVersion(
       "@christianhugoch/empty_sc_test_plugin",
       "0.0.1"
@@ -404,10 +404,10 @@ describe("Upgrade plugin to supported version", () => {
     const upgradedPlugin = await Plugin.findOne({
       name: "@christianhugoch/empty_sc_test_plugin",
     });
-    expect(upgradedPlugin.version).toBe("0.0.1");
+    expect(upgradedPlugin.version).toBe("0.1.0");
   });
 
-  it("upgrades with a downgrade of the most current fixed version", async () => {
+  it("upgrades with a downgrade of latest as fixed version", async () => {
     const oldPlugin = await setupPluginVersion(
       "@christianhugoch/empty_sc_test_plugin",
       "0.0.1"
@@ -421,13 +421,13 @@ describe("Upgrade plugin to supported version", () => {
           "@christianhugoch/empty_sc_test_plugin"
         )}`
       )
-      .send("version=0.1.0")
+      .send("version=0.2.0")
       .set("Cookie", loginCookie)
       .expect(toRedirect("/plugins"));
     const upgradedPlugin = await Plugin.findOne({
       name: "@christianhugoch/empty_sc_test_plugin",
     });
-    expect(upgradedPlugin.version).toBe("0.0.1");
+    expect(upgradedPlugin.version).toBe("0.1.0");
   });
 });