@saltcorn/server 0.7.3-beta.2 → 0.7.3-beta.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/app.js +5 -1
- package/auth/routes.js +37 -10
- package/locales/en.json +923 -916
- package/locales/zh.json +188 -188
- package/markup/admin.js +5 -1
- package/package.json +8 -8
- package/public/gridedit.js +6 -0
- package/public/jquery-menu-editor.min.js +15 -2
- package/public/saltcorn-common.js +78 -2
- package/public/saltcorn.css +22 -0
- package/public/saltcorn.js +19 -38
- package/routes/admin.js +391 -2
- package/routes/fields.js +3 -0
- package/routes/files.js +5 -3
- package/routes/homepage.js +7 -7
- package/routes/menu.js +13 -1
- package/routes/pageedit.js +1 -0
- package/routes/plugins.js +1 -0
- package/routes/tables.js +7 -6
- package/routes/viewedit.js +11 -1
- package/serve.js +1 -1
- package/tests/tenant.test.js +6 -0
package/serve.js
CHANGED
|
@@ -348,7 +348,7 @@ const setupSocket = (...servers) => {
|
|
|
348
348
|
io.use(wrap(setTenant));
|
|
349
349
|
io.use(wrap(getSessionStore()));
|
|
350
350
|
io.use(wrap(passport.initialize()));
|
|
351
|
-
io.use(wrap(passport.session
|
|
351
|
+
io.use(wrap(passport.authenticate(["jwt", "session"])));
|
|
352
352
|
if (process.send && !cluster.isMaster) io.adapter(createAdapter());
|
|
353
353
|
getState().setRoomEmitter((viewname, room_id, msg) => {
|
|
354
354
|
io.to(`${viewname}_${room_id}`).emit("message", msg);
|
package/tests/tenant.test.js
CHANGED
|
@@ -10,6 +10,7 @@ const {
|
|
|
10
10
|
toInclude,
|
|
11
11
|
toNotInclude,
|
|
12
12
|
} = require("../auth/testhelp");
|
|
13
|
+
const { getState } = require("@saltcorn/data/db/state");
|
|
13
14
|
|
|
14
15
|
afterAll(db.close);
|
|
15
16
|
|
|
@@ -24,6 +25,8 @@ describe("tenant routes", () => {
|
|
|
24
25
|
if (!db.isSQLite) {
|
|
25
26
|
it("shows create form", async () => {
|
|
26
27
|
db.enable_multi_tenant();
|
|
28
|
+
await getState().setConfig("role_to_create_tenant", "10");
|
|
29
|
+
|
|
27
30
|
const app = await getApp({ disableCsrf: true });
|
|
28
31
|
await request(app).get("/tenant/create").expect(toInclude("subdomain"));
|
|
29
32
|
});
|
|
@@ -37,6 +40,8 @@ describe("tenant routes", () => {
|
|
|
37
40
|
});
|
|
38
41
|
it("creates tenant with capital letter", async () => {
|
|
39
42
|
db.enable_multi_tenant();
|
|
43
|
+
await getState().setConfig("role_to_create_tenant", "10");
|
|
44
|
+
|
|
40
45
|
const app = await getApp({ disableCsrf: true });
|
|
41
46
|
await request(app)
|
|
42
47
|
.post("/tenant/create")
|
|
@@ -46,6 +51,7 @@ describe("tenant routes", () => {
|
|
|
46
51
|
});
|
|
47
52
|
it("rejects existing tenant", async () => {
|
|
48
53
|
db.enable_multi_tenant();
|
|
54
|
+
await getState().setConfig("role_to_create_tenant", "10");
|
|
49
55
|
const app = await getApp({ disableCsrf: true });
|
|
50
56
|
await request(app)
|
|
51
57
|
.post("/tenant/create")
|