@saltcorn/server 1.0.0-beta.16 → 1.0.0-beta.17
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 +1 -7
- package/package.json +10 -10
- package/routes/actions.js +4 -1
- package/routes/admin.js +2 -2
package/app.js
CHANGED
|
@@ -306,13 +306,7 @@ const getApp = async (opts = {}) => {
|
|
|
306
306
|
? new Date(u.last_mobile_login).valueOf()
|
|
307
307
|
: u.last_mobile_login) <= jwt_payload.iat
|
|
308
308
|
) {
|
|
309
|
-
return done(null,
|
|
310
|
-
email: u.email,
|
|
311
|
-
id: u.id,
|
|
312
|
-
role_id: u.role_id,
|
|
313
|
-
language: u.language,
|
|
314
|
-
tenant: db.getTenantSchema(),
|
|
315
|
-
});
|
|
309
|
+
return done(null, u.session_object);
|
|
316
310
|
} else {
|
|
317
311
|
return done(null, { role_id: 100 });
|
|
318
312
|
}
|
package/package.json
CHANGED
|
@@ -1,20 +1,20 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@saltcorn/server",
|
|
3
|
-
"version": "1.0.0-beta.
|
|
3
|
+
"version": "1.0.0-beta.17",
|
|
4
4
|
"description": "Server app for Saltcorn, open-source no-code platform",
|
|
5
5
|
"homepage": "https://saltcorn.com",
|
|
6
6
|
"main": "index.js",
|
|
7
7
|
"license": "MIT",
|
|
8
8
|
"dependencies": {
|
|
9
9
|
"@aws-sdk/client-s3": "^3.451.0",
|
|
10
|
-
"@saltcorn/base-plugin": "1.0.0-beta.
|
|
11
|
-
"@saltcorn/builder": "1.0.0-beta.
|
|
12
|
-
"@saltcorn/data": "1.0.0-beta.
|
|
13
|
-
"@saltcorn/admin-models": "1.0.0-beta.
|
|
14
|
-
"@saltcorn/filemanager": "1.0.0-beta.
|
|
15
|
-
"@saltcorn/markup": "1.0.0-beta.
|
|
16
|
-
"@saltcorn/plugins-loader": "1.0.0-beta.
|
|
17
|
-
"@saltcorn/sbadmin2": "1.0.0-beta.
|
|
10
|
+
"@saltcorn/base-plugin": "1.0.0-beta.17",
|
|
11
|
+
"@saltcorn/builder": "1.0.0-beta.17",
|
|
12
|
+
"@saltcorn/data": "1.0.0-beta.17",
|
|
13
|
+
"@saltcorn/admin-models": "1.0.0-beta.17",
|
|
14
|
+
"@saltcorn/filemanager": "1.0.0-beta.17",
|
|
15
|
+
"@saltcorn/markup": "1.0.0-beta.17",
|
|
16
|
+
"@saltcorn/plugins-loader": "1.0.0-beta.17",
|
|
17
|
+
"@saltcorn/sbadmin2": "1.0.0-beta.17",
|
|
18
18
|
"@socket.io/cluster-adapter": "^0.2.1",
|
|
19
19
|
"@socket.io/sticky": "^1.0.1",
|
|
20
20
|
"adm-zip": "0.5.10",
|
|
@@ -55,7 +55,7 @@
|
|
|
55
55
|
"pg": "^8.2.1",
|
|
56
56
|
"pluralize": "^8.0.0",
|
|
57
57
|
"qrcode": "1.5.1",
|
|
58
|
-
"resize-with-sharp-or-jimp": "0.1.
|
|
58
|
+
"resize-with-sharp-or-jimp": "0.1.8",
|
|
59
59
|
"semver": "^7.6.0",
|
|
60
60
|
"socket.io": "4.6.0",
|
|
61
61
|
"systeminformation": "^5.21.7",
|
package/routes/actions.js
CHANGED
|
@@ -546,7 +546,10 @@ router.get(
|
|
|
546
546
|
let trigger;
|
|
547
547
|
let id = parseInt(idorname);
|
|
548
548
|
if (id) trigger = await Trigger.findOne({ id });
|
|
549
|
-
else
|
|
549
|
+
else {
|
|
550
|
+
trigger = await Trigger.findOne({ name: idorname });
|
|
551
|
+
id = trigger.id;
|
|
552
|
+
}
|
|
550
553
|
|
|
551
554
|
if (!trigger) {
|
|
552
555
|
req.flash("warning", req.__("Action not found"));
|
package/routes/admin.js
CHANGED
|
@@ -3224,8 +3224,8 @@ router.post(
|
|
|
3224
3224
|
error_catcher(async (req, res) => {
|
|
3225
3225
|
const state = getState();
|
|
3226
3226
|
const child = spawn(
|
|
3227
|
-
"docker
|
|
3228
|
-
["
|
|
3227
|
+
`${process.env.DOCKER_BIN ? `${process.env.DOCKER_BIN}/` : ""}docker`,
|
|
3228
|
+
["pull", "saltcorn/cordova-builder:latest"],
|
|
3229
3229
|
{
|
|
3230
3230
|
stdio: ["ignore", "pipe", "pipe"],
|
|
3231
3231
|
cwd: ".",
|