@saltcorn/server 0.9.1-beta.2 → 0.9.1-beta.4

package/help/API actions.tmd

@@ -9,4 +9,23 @@ If you make a GET request, the query string values
 are accessible as a JSON object using the `row` variable (e.g. in a `run_js_code`).
 
 If you return a value from the action, it will be available in the `data`
-subfield of the JSON body in the HTTP response
+subfield of the JSON body in the HTTP response
+
+### Redirection as response
+
+Normally API call will return a JSON object with a true/false success field 
+and the response from the action, if any, in the data field. You may instead
+require the API call to redirect to a different URL. You can do this in two 
+different ways.
+
+**Static redirect**: if you set the `scgotourl` HTTP header, the response will 
+redirect to this URL.
+
+**Dynamic redirect**: The redirect URL can also come from the action. If this
+returns an object with the `goto` field (e.g. 
+`return {goto: "https://myapp.com/view/ShowTheThing?id"+newid}`)
+that is normally returned in the JSON post body so it can be processed by client code.
+You can instead request that this is processed server-side, by (a) setting a 
+`_process_result` field to true in the row data, i.e. JSON body in POST and query
+string in GET or (b) setting the `scprocessresults` HTTP header. This will cause the 
+API call to return an HTTP redirect with the `goto` value.

package/help/Extra state formula.tmd

@@ -33,6 +33,9 @@ must be enclosed in quotes (single, double or
 [backtick](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Template_literals))). 
 You can also as the value use a more complex JavaScript expression.
 
+For examples of how you can use these values for greater than/less than, 
+or-conditions or case insensitivity, see [here](https://saltcorn.github.io/saltcorn/classes/_saltcorn_data.models.Table-1.html#md:querying-table-rows).
+
 You can refer to the logged in user using the variable name user. 
 This is an object and you must use the dot to access user fields,
 e.g. user.id for the logged in users id. A very common scenario 
@@ -60,3 +63,9 @@ in this case the table {{srcTable.name}}:
 
 {{# } }}
 
+The state values from the query string can also be accessed, by preceeding the 
+variable name by a dollar sign (in pages and Show views). For instance if your URL ends in `?id=45&foo=1`, 
+you can access the value of `foo` (here 1) as `$foo`. In Filter views, there is no 
+underlying row and the purpose of the view is fundamentally to manipulate the state
+so the state in extra state formulae is accessed without dollar sign; in the 
+previous example `foo` instead of `$foo`.

package/package.json

@@ -1,28 +1,29 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.9.1-beta.2",
+  "version": "0.9.1-beta.4",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@saltcorn/base-plugin": "0.9.1-beta.2",
-    "@saltcorn/builder": "0.9.1-beta.2",
-    "@saltcorn/data": "0.9.1-beta.2",
-    "@saltcorn/admin-models": "0.9.1-beta.2",
-    "@saltcorn/filemanager": "0.9.1-beta.2",
-    "@saltcorn/markup": "0.9.1-beta.2",
-    "@saltcorn/sbadmin2": "0.9.1-beta.2",
+    "@aws-sdk/client-s3": "^3.451.0",
+    "@saltcorn/base-plugin": "0.9.1-beta.4",
+    "@saltcorn/builder": "0.9.1-beta.4",
+    "@saltcorn/data": "0.9.1-beta.4",
+    "@saltcorn/admin-models": "0.9.1-beta.4",
+    "@saltcorn/filemanager": "0.9.1-beta.4",
+    "@saltcorn/markup": "0.9.1-beta.4",
+    "@saltcorn/sbadmin2": "0.9.1-beta.4",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",
-    "aws-sdk": "^2.1386.0",
     "connect-flash": "^0.1.1",
     "connect-pg-simple": "^6.1.0",
     "content-disposition": "^0.5.3",
     "contractis": "^0.1.0",
     "cookie-parser": "^1.4.4",
     "cookie-session": "^1.4.0",
+    "cors": "2.8.5",
     "csurf": "^1.11.0",
     "csv-stringify": "^5.5.0",
     "express": "^4.17.1",
@@ -32,7 +33,6 @@
     "express-session": "^1.17.1",
     "greenlock": "^4.0.4",
     "greenlock-express": "^4.0.3",
-    "underscore": "1.13.6",
     "helmet": "^3.23.3",
     "i18n": "^0.15.1",
     "imapflow": "1.0.123",
@@ -41,7 +41,7 @@
     "markdown-it": "^13.0.2",
     "moment": "^2.29.4",
     "multer": "1.4.5-lts.1",
-    "multer-s3": "^2.10.0",
+    "multer-s3": "^3.0.1",
     "node-fetch": "2.6.9",
     "node-watch": "^0.7.2",
     "notp": "2.0.3",
@@ -59,8 +59,8 @@
     "systeminformation": "^5.21.7",
     "thirty-two": "1.0.2",
     "tmp-promise": "^3.0.2",
-    "uuid": "^8.2.0",
-    "cors": "2.8.5"
+    "underscore": "1.13.6",
+    "uuid": "^8.2.0"
   },
   "optionalDependencies": {
     "connect-sqlite3": "^0.9.11",

package/routes/api.js

@@ -358,14 +358,22 @@ router.all(
         if (accessAllowed(req, user, trigger)) {
           try {
             const action = getState().actions[trigger.action];
+            const row = req.method === "GET" ? req.query : req.body;
             const resp = await action.run({
               configuration: trigger.configuration,
               body: req.body,
-              row: req.method === "GET" ? req.query : req.body,
+              row,
               req,
               user: user || req.user,
             });
-            res.json({ success: true, data: resp });
+            if (
+              (row._process_result || req.headers?.scprocessresults) &&
+              resp?.goto
+            )
+              res.redirect(resp.goto);
+            else if (req.headers?.scgotourl)
+              res.redirect(req.headers?.scgotourl);
+            else res.json({ success: true, data: resp });
           } catch (e) {
             Crash.create(e, req);
             res.status(400).json({ success: false, error: e.message });

package/s3storage.js

@@ -1,5 +1,4 @@
-require("aws-sdk/lib/maintenance_mode_message").suppress = true;
-const aws = require("aws-sdk");
+const { S3 } = require("@aws-sdk/client-s3");
 const multer = require("multer");
 const multerS3 = require("multer-s3");
 const { getState } = require("@saltcorn/data/db/state");
@@ -8,9 +7,11 @@ const { v4: uuidv4 } = require("uuid");
 const contentDisposition = require("content-disposition");
 const fs = require("fs");
 function createS3Client() {
-  return new aws.S3({
-    secretAccessKey: getState().getConfig("storage_s3_access_secret"),
-    accessKeyId: getState().getConfig("storage_s3_access_key"),
+  return new S3({
+    credentials: {
+      secretAccessKey: getState().getConfig("storage_s3_access_secret"),
+      accessKeyId: getState().getConfig("storage_s3_access_key"),
+    },
     region: getState().getConfig("storage_s3_region"),
     endpoint: getState().getConfig("storage_s3_endpoint"),
   });