@saltcorn/server 0.8.6-beta.9 → 0.8.6

package/serve.js

@@ -8,6 +8,7 @@ const runScheduler = require("@saltcorn/data/models/scheduler");
 const User = require("@saltcorn/data/models/user");
 const Plugin = require("@saltcorn/data/models/plugin");
 const db = require("@saltcorn/data/db");
+const { getConfigFile, configFilePath } = require("@saltcorn/data/db/connect");
 const {
   getState,
   init_multi_tenant,
@@ -49,11 +50,33 @@ const {
 } = require("@saltcorn/admin-models/models/tenant");
 const { auto_backup_now } = require("@saltcorn/admin-models/models/backup");
 const Snapshot = require("@saltcorn/admin-models/models/snapshot");
+const { writeFileSync } = require("fs");
 
 const take_snapshot = async () => {
   return await Snapshot.take_if_changed();
 };
 
+/**
+ * Ensure the cfg file has a jwt_secret
+ */
+const ensureJwtSecret = () => {
+  const cfg = getConfigFile();
+  if (cfg && !cfg.jwt_secret) {
+    try {
+      const newSecret = require("crypto").randomBytes(64).toString("hex");
+      cfg.jwt_secret = newSecret;
+      writeFileSync(configFilePath, JSON.stringify(cfg, null, 2));
+      db.connectObj.jwt_secret = newSecret;
+    } catch (error) {
+      console.log(
+        `Unable to set a jwt_secret: ${
+          error.message ? error.message : "Unknown error"
+        }`
+      );
+    }
+  }
+};
+
 // helpful https://gist.github.com/jpoehls/2232358
 /**
  * @param {object} opts
@@ -195,6 +218,7 @@ module.exports =
     dev,
     ...appargs
   } = {}) => {
+    ensureJwtSecret();
     process.on("unhandledRejection", (reason, p) => {
       console.error(reason, "Unhandled Rejection at Promise");
     });
@@ -263,7 +287,7 @@ module.exports =
             httpsServer.setTimeout(timeout * 1000);
             process.on("message", workerDispatchMsg);
             glx.serveApp(app);
-            process.send && process.send("Start");
+            getState().processSend("Start");
           })
           .master(() => {
             initMaster(appargs).then(initMasterListeners);
@@ -349,7 +373,7 @@ const nonGreenlockWorkerSetup = async (appargs, port) => {
       console.log(`Saltcorn listening on http://localhost:${port}/`);
     });
   }
-  process.send && process.send("Start");
+  getState().processSend("Start");
 };
 
 /**

package/tests/api.test.js

@@ -128,7 +128,7 @@ describe("API read", () => {
       .expect(succeedJsonWith((rows) => rows.length == 2));
   });
   it("should add version counts", async () => {
-    const patients = await Table.findOne({ name: "patients" });
+    const patients = Table.findOne({ name: "patients" });
     await patients.update({ versioned: true });
 
     const loginCookie = await getStaffLoginCookie();

package/tests/auth.test.js

@@ -329,7 +329,7 @@ describe("user admin", () => {
 });
 describe("User fields", () => {
   it("should add fields", async () => {
-    const table = await Table.findOne({ name: "users" });
+    const table = Table.findOne({ name: "users" });
     await Field.create({
       table,
       label: "Height",
@@ -395,7 +395,7 @@ describe("User fields", () => {
       .send("password=seCERGERG45et")
       .send("height=191")
       .expect(toRedirect("/"));
-    const table = await Table.findOne({ name: "users" });
+    const table = Table.findOne({ name: "users" });
     const ut = await table.getRow({ email: "staff14@foo.com" });
     expect(ut.email).toBe("staff14@foo.com");
     expect(ut.height).toBe(191);
@@ -404,7 +404,7 @@ describe("User fields", () => {
 
 describe("signup with custom login form", () => {
   it("should create user fields and login form", async () => {
-    const table = await Table.findOne({ name: "users" });
+    const table = Table.findOne({ name: "users" });
     const fc = await Field.create({
       table,
       label: "Username",
@@ -662,7 +662,7 @@ describe("signup with custom login form", () => {
       .send("height=15")
       .expect(toRedirect("/"));
 
-    const table = await Table.findOne({ name: "users" });
+    const table = Table.findOne({ name: "users" });
     const user = await User.findOne({ email: "staff8@foo.com" });
     expect(!!user).toBe(true);
     expect(user.checkPassword("seCERRG45et")).toBe(true);

package/tests/crud.test.js

@@ -163,7 +163,7 @@ describe("homepage", () => {
       .expect(toInclude("No views"));
   });
   it("shows with-view quick start", async () => {
-    const table = await Table.findOne({ name: "mytable" });
+    const table = Table.findOne({ name: "mytable" });
 
     const v = await View.create({
       table_id: table.id,
@@ -200,7 +200,7 @@ describe("bool toggle", () => {
 
 describe("history", () => {
   it("should enable history", async () => {
-    const table = await Table.findOne({ name: "books" });
+    const table = Table.findOne({ name: "books" });
 
     const loginCookie = await getAdminLoginCookie();
 
@@ -211,7 +211,7 @@ describe("history", () => {
       .send("id=" + table.id)
       .send("versioned=on")
       .expect(toRedirect("/table/" + table.id));
-    const table1 = await Table.findOne({ name: "books" });
+    const table1 = Table.findOne({ name: "books" });
     expect(table1.versioned).toBe(true);
   });
   it("create new row in versioned table", async () => {
@@ -231,7 +231,7 @@ describe("history", () => {
   it("edit row in versioned table", async () => {
     const loginCookie = await getAdminLoginCookie();
     const app = await getApp({ disableCsrf: true });
-    const table = await Table.findOne({ name: "books" });
+    const table = Table.findOne({ name: "books" });
     const tolstoy = await table.getRow({ author: "Leo Tolstoy" });
     await request(app)
       .post("/api/books/" + tolstoy.id)
@@ -247,7 +247,7 @@ describe("history", () => {
   it("edit row in versioned table again", async () => {
     const loginCookie = await getAdminLoginCookie();
     const app = await getApp({ disableCsrf: true });
-    const table = await Table.findOne({ name: "books" });
+    const table = Table.findOne({ name: "books" });
     const tolstoy = await table.getRow({ author: "Leo Tolstoy" });
     await request(app)
       .post("/api/books/" + tolstoy.id)
@@ -263,7 +263,7 @@ describe("history", () => {
 
   it("show versions", async () => {
     const loginCookie = await getAdminLoginCookie();
-    const table = await Table.findOne({ name: "books" });
+    const table = Table.findOne({ name: "books" });
     const tolstoy = await table.getRow({ author: "Leo Tolstoy" });
     const app = await getApp({ disableCsrf: true });
     await request(app)
@@ -276,7 +276,7 @@ describe("history", () => {
   });
   it("restores old version", async () => {
     const loginCookie = await getAdminLoginCookie();
-    const table = await Table.findOne({ name: "books" });
+    const table = Table.findOne({ name: "books" });
     const tolstoy = await table.getRow({ author: "Leo Tolstoy" });
     const app = await getApp({ disableCsrf: true });
     await request(app)

package/tests/fields.test.js

@@ -44,7 +44,7 @@ describe("Field Endpoints", () => {
 
   it("should post new int field", async () => {
     const loginCookie = await getAdminLoginCookie();
-    const table = await Table.findOne({ name: "books" });
+    const table = Table.findOne({ name: "books" });
 
     const ctx = encodeURIComponent(JSON.stringify({ table_id: table.id }));
     const app = await getApp({ disableCsrf: true });
@@ -61,7 +61,7 @@ describe("Field Endpoints", () => {
 
   it("should post new int field with attributes", async () => {
     const loginCookie = await getAdminLoginCookie();
-    const table = await Table.findOne({ name: "books" });
+    const table = Table.findOne({ name: "books" });
 
     const ctx = encodeURIComponent(
       JSON.stringify({
@@ -228,7 +228,7 @@ describe("Field Endpoints", () => {
 
   it("should post new calculated int field", async () => {
     const loginCookie = await getAdminLoginCookie();
-    const table = await Table.findOne({ name: "books" });
+    const table = Table.findOne({ name: "books" });
 
     const ctx = encodeURIComponent(JSON.stringify({ table_id: table.id }));
     const app = await getApp({ disableCsrf: true });
@@ -258,14 +258,14 @@ describe("Field Endpoints", () => {
       .send("contextEnc=" + ctx1)
       .set("Cookie", loginCookie)
       .expect(toRedirect("/table/2"));
-    const table1 = await Table.findOne({ name: "books" });
+    const table1 = Table.findOne({ name: "books" });
 
     const row = await table1.getRow({ id: 1 });
     expect(row.pagesplus10).toBe(977);
   });
   it("should post new calculated string field", async () => {
     const loginCookie = await getAdminLoginCookie();
-    const table = await Table.findOne({ name: "books" });
+    const table = Table.findOne({ name: "books" });
 
     const ctx = encodeURIComponent(JSON.stringify({ table_id: table.id }));
     const app = await getApp({ disableCsrf: true });
@@ -283,7 +283,7 @@ describe("Field Endpoints", () => {
   });
   it("should post new calculated float field", async () => {
     const loginCookie = await getAdminLoginCookie();
-    const table = await Table.findOne({ name: "books" });
+    const table = Table.findOne({ name: "books" });
 
     const ctx = encodeURIComponent(JSON.stringify({ table_id: table.id }));
     const app = await getApp({ disableCsrf: true });
@@ -301,7 +301,7 @@ describe("Field Endpoints", () => {
   });
   it("should post new calculated boolean field", async () => {
     const loginCookie = await getAdminLoginCookie();
-    const table = await Table.findOne({ name: "books" });
+    const table = Table.findOne({ name: "books" });
 
     const ctx = encodeURIComponent(JSON.stringify({ table_id: table.id }));
     const app = await getApp({ disableCsrf: true });
@@ -319,7 +319,7 @@ describe("Field Endpoints", () => {
   });
   it("should test expression", async () => {
     const loginCookie = await getAdminLoginCookie();
-    const table = await Table.findOne({ name: "books" });
+    const table = Table.findOne({ name: "books" });
 
     const ctx = encodeURIComponent(JSON.stringify({ table_id: table.id }));
     const app = await getApp({ disableCsrf: true });
@@ -335,7 +335,7 @@ describe("Field Endpoints", () => {
   });
   it("should test stored expression", async () => {
     const loginCookie = await getAdminLoginCookie();
-    const table = await Table.findOne({ name: "books" });
+    const table = Table.findOne({ name: "books" });
 
     const ctx = encodeURIComponent(JSON.stringify({ table_id: table.id }));
     const app = await getApp({ disableCsrf: true });
@@ -351,7 +351,7 @@ describe("Field Endpoints", () => {
   });
   it("should show calculated", async () => {
     const loginCookie = await getAdminLoginCookie();
-    const table = await Table.findOne({ name: "books" });
+    const table = Table.findOne({ name: "books" });
     await Field.create({
       table,
       label: "pagesp1",

package/tests/files.test.js

@@ -218,7 +218,7 @@ describe("files edit", () => {
       .expect(toRedirect("/"));
   });
   it("has file", async () => {
-    const table = await Table.findOne({ name: "thefiletable" });
+    const table = Table.findOne({ name: "thefiletable" });
     const row = await table.getRow({ first_name: "elvis" });
     const file = await File.findOne({ id: row.mugshot });
     expect(!!file).toBe(true);

package/tests/kittens.test.js

@@ -256,7 +256,7 @@ describe("Kitten tracker", () => {
       .expect(toRedirect("/"));
   });
   it("should insert rows", async () => {
-    const tbl = await Table.findOne({ name: "cats" });
+    const tbl = Table.findOne({ name: "cats" });
     expect(!!tbl).toBe(true);
     await tbl.insertRow({ name: "Charlie", stage: "Kitten", lat: 51, long: 0 });
     await tbl.insertRow({

package/tests/table.test.js

@@ -86,7 +86,7 @@ describe("Table Endpoints", () => {
   it("should edit tables", async () => {
     const loginCookie = await getAdminLoginCookie();
 
-    const tbl = await Table.findOne({ name: "mypostedtable" });
+    const tbl = Table.findOne({ name: "mypostedtable" });
 
     const app = await getApp({ disableCsrf: true });
     await request(app)
@@ -186,7 +186,7 @@ Gordon Kane, 218`;
   it("should delete tables", async () => {
     const loginCookie = await getAdminLoginCookie();
     const app = await getApp({ disableCsrf: true });
-    const tbl = await Table.findOne({ name: "mypostedtable" });
+    const tbl = Table.findOne({ name: "mypostedtable" });
     const delres = await request(app)
       .post(`/table/delete/${tbl.id}`)
       .set("Cookie", loginCookie);
@@ -200,7 +200,7 @@ Gordon Kane, 218`;
   });
   it("should show constraints", async () => {
     const loginCookie = await getAdminLoginCookie();
-    const tbl = await Table.findOne({ name: "books" });
+    const tbl = Table.findOne({ name: "books" });
     const id = tbl.id;
     const app = await getApp({ disableCsrf: true });
     await request(app)
@@ -241,7 +241,7 @@ Gordon Kane, 218`;
   it("should delete tables", async () => {
     const loginCookie = await getAdminLoginCookie();
     const app = await getApp({ disableCsrf: true });
-    const tbl = await Table.findOne({ name: "books" });
+    const tbl = Table.findOne({ name: "books" });
     await request(app)
       .post(`/table/delete/${tbl.id}`)
       .set("Cookie", loginCookie)

package/tests/view.test.js

@@ -92,7 +92,7 @@ describe("view with routes", () => {
   it("should enable", async () => {
     getState().registerPlugin("mock_plugin", plugin_with_routes());
     expect(getState().viewtemplates.ViewWithRoutes.name).toBe("ViewWithRoutes");
-    const table = await Table.findOne({ name: "books" });
+    const table = Table.findOne({ name: "books" });
 
     const v = await View.create({
       table_id: table.id,
@@ -143,7 +143,7 @@ describe("render view on page", () => {
 describe("render view with slug", () => {
   it("should show with id slug in list", async () => {
     const view = await View.findOne({ name: "authorshow" });
-    const table = await Table.findOne({ name: "books" });
+    const table = Table.findOne({ name: "books" });
     const slugOpts = await table.slug_options();
     const slugOpt = slugOpts.find((so) => so.label === "/:id");
     expect(!!slugOpt).toBe(true);
@@ -158,11 +158,11 @@ describe("render view with slug", () => {
   });
   it("should show with name slug in list", async () => {
     const view = await View.findOne({ name: "authorshow" });
-    const table0 = await Table.findOne({ name: "books" });
+    const table0 = Table.findOne({ name: "books" });
     const fields = await table0.getFields();
     const field = fields.find((f) => f.name === "author");
     await field.update({ is_unique: true });
-    const table = await Table.findOne({ name: "books" });
+    const table = Table.findOne({ name: "books" });
 
     const slugOpts = await table.slug_options();
     const slugOpt = slugOpts.find((so) => so.label === "/slugify-author");

package/tests/viewedit.test.js

@@ -102,7 +102,7 @@ describe("viewedit new List", () => {
   });
   it("save new view", async () => {
     const loginCookie = await getAdminLoginCookie();
-    const table = await Table.findOne({ name: "books" });
+    const table = Table.findOne({ name: "books" });
 
     const ctx = encodeURIComponent(
       JSON.stringify({
@@ -125,7 +125,7 @@ describe("viewedit new List", () => {
   });
   it("save new views default state", async () => {
     const loginCookie = await getAdminLoginCookie();
-    const table = await Table.findOne({ name: "books" });
+    const table = Table.findOne({ name: "books" });
 
     const ctx = encodeURIComponent(
       JSON.stringify({
@@ -153,7 +153,7 @@ describe("viewedit new List", () => {
   });
   it("save new views options", async () => {
     const loginCookie = await getAdminLoginCookie();
-    const table = await Table.findOne({ name: "books" });
+    const table = Table.findOne({ name: "books" });
 
     const ctx = encodeURIComponent(
       JSON.stringify({
@@ -219,7 +219,7 @@ describe("viewedit new List with one field", () => {
   });
   it("save new view", async () => {
     const loginCookie = await getAdminLoginCookie();
-    const table = await Table.findOne({ name: "books" });
+    const table = Table.findOne({ name: "books" });
 
     const ctx = encodeURIComponent(
       JSON.stringify({
@@ -240,7 +240,7 @@ describe("viewedit new List with one field", () => {
   });
   it("save new views default state", async () => {
     const loginCookie = await getAdminLoginCookie();
-    const table = await Table.findOne({ name: "books" });
+    const table = Table.findOne({ name: "books" });
 
     const ctx = encodeURIComponent(
       JSON.stringify({
@@ -264,7 +264,7 @@ describe("viewedit new List with one field", () => {
   });
   it("save new views options", async () => {
     const loginCookie = await getAdminLoginCookie();
-    const table = await Table.findOne({ name: "books" });
+    const table = Table.findOne({ name: "books" });
 
     const ctx = encodeURIComponent(
       JSON.stringify({
@@ -341,7 +341,7 @@ describe("viewedit new Show", () => {
   });
   it("save new view layout", async () => {
     const loginCookie = await getAdminLoginCookie();
-    const table = await Table.findOne({ name: "books" });
+    const table = Table.findOne({ name: "books" });
 
     const ctx = encodeURIComponent(
       JSON.stringify({
@@ -362,7 +362,7 @@ describe("viewedit new Show", () => {
   });
   it("save new view page title", async () => {
     const loginCookie = await getAdminLoginCookie();
-    const table = await Table.findOne({ name: "books" });
+    const table = Table.findOne({ name: "books" });
 
     const ctx = encodeURIComponent(
       JSON.stringify({