@saltcorn/server 0.6.2-beta.1 → 0.6.2-beta.5

package/s3storage.js

@@ -0,0 +1,167 @@
+var aws = require("aws-sdk");
+var express = require("express");
+var multer = require("multer");
+var multerS3 = require("multer-s3");
+const { getState } = require("@saltcorn/data/db/state");
+const fileUpload = require("express-fileupload");
+const { v4: uuidv4 } = require("uuid");
+const { create } = require("@saltcorn/data/models/file");
+var contentDisposition = require("content-disposition");
+
+function createS3Client() {
+  return new aws.S3({
+    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"),
+  });
+}
+
+module.exports = {
+  /**
+   * Selector for file upload handler middleware. It will dispatch the
+   * file upload handler to the engine specified in the configuration.
+   *
+   * @param {*} req
+   * @param {*} res
+   * @param {*} next
+   */
+  middlewareSelect: async function (req, res, next) {
+    const useS3 = getState().getConfig("storage_s3_enabled");
+    if (useS3 === true) {
+      // Create S3 object
+
+      // Create multer function
+      const s3upload = multer({
+        storage: multerS3({
+          s3: createS3Client(),
+          bucket: getState().getConfig("storage_s3_bucket"),
+          metadata: function (req, file, cb) {
+            cb(null, { fieldName: file.fieldname });
+          },
+          key: function (req, file, cb) {
+            cb(null, "tmp/" + Date.now().toString() + uuidv4());
+          },
+        }),
+      }).any();
+
+      s3upload(req, res, next);
+    } else {
+      // Use regular file upload
+      fileUpload({
+        useTempFiles: true,
+        createParentPath: true,
+        tempFileDir: "/tmp/",
+      })(req, res, next);
+    }
+  },
+
+  /**
+   * Transform the processed req.files into that is suitable with
+   * Saltcorn File interface. It must be run after the middlewareSelect
+   *
+   * @param {*} req
+   * @param {*} res
+   * @param {*} next
+   */
+  middlewareTransform: async function (req, res, next) {
+    // If nothing to process or S3 is not enabled
+    const useS3 = getState().getConfig("storage_s3_enabled");
+    if (!req.files || !useS3) {
+      next();
+      return;
+    }
+
+    // Create S3 object
+    var s3 = createS3Client();
+    const bucket = getState().getConfig("storage_s3_bucket");
+
+    let newFileObject = {};
+    for (const file of req.files) {
+      file.mv = (newpath) => {
+        return new Promise((resolve, reject) => {
+          s3.copyObject(
+            {
+              Bucket: bucket,
+              CopySource: bucket + "/" + file.key,
+              Key: newpath,
+            },
+            function (err, data) {
+              if (err) reject(err);
+              else {
+                // Then delete
+                s3.deleteObject(
+                  {
+                    Bucket: bucket,
+                    Key: file.key,
+                  },
+                  (err, data) => {
+                    if (err) reject(err);
+                    else resolve(data);
+                  }
+                );
+              }
+            }
+          );
+        });
+      };
+      file.s3object = true;
+      file.name = file.originalname;
+      newFileObject[file.fieldname] = file;
+    }
+    req.files = newFileObject;
+    next();
+  },
+
+  /**
+   * Selector to serve object based on S3 state
+   *
+   * @param {*} file
+   * @param {*} res
+   * @param {*} download
+   */
+  serveObject: function (file, res, download) {
+    if (file.s3_store) {
+      var s3 = createS3Client();
+      const bucket = getState().getConfig("storage_s3_bucket");
+
+      var params = {
+        Bucket: bucket,
+        Key: file.location,
+      };
+
+      // Forward the object
+      s3.getObject(params)
+        .on("httpHeaders", function (statusCode, headers) {
+          if (!!download)
+            res.set("Content-Disposition", contentDisposition(file.filename));
+          res.set("Content-Length", headers["content-length"]);
+          this.response.httpResponse.createUnbufferedStream().pipe(res);
+        })
+        .send();
+    } else {
+      // Use legacy file download
+      res.download(file.location, file.filename);
+    }
+  },
+
+  unlinkObject: function (file) {
+    if (file.s3_store) {
+      var s3 = createS3Client();
+      return new Promise((resolve, reject) => {
+        s3.deleteObject(
+          {
+            Bucket: getState().getConfig("storage_s3_bucket"),
+            Key: file.location,
+          },
+          (err, data) => {
+            if (err) reject(err);
+            else resolve(data);
+          }
+        );
+      });
+    } else {
+      return fs.unlink(file.location);
+    }
+  },
+};

package/tests/admin.test.js

@@ -268,8 +268,10 @@ describe("menu editor", () => {
     await request(app)
       .post("/menu")
       .set("Cookie", loginCookie)
-      .send("menu=" + encodeURIComponent(JSON.stringify(menu_json)))
-      .expect(toRedirect("/menu"));
+      .send(menu_json)
+      .set("Content-Type", "application/json")
+      .set("Accept", "application/json")
+      .expect(toSucceed);
   });
   it("show new menu", async () => {
     const app = await getApp({ disableCsrf: true });

package/wrapper.js

@@ -16,7 +16,10 @@ const getFlashes = (req) =>
     .filter((a) => a.msg && a.msg.length && a.msg.length > 0);
 
 const get_extra_menu = (role, state, req) => {
-  const cfg = getState().getConfig("menu_items", []);
+  let cfg = getState().getConfig("unrolled_menu_items", []);
+  if (!cfg || cfg.length === 0) {
+    cfg = getState().getConfig("menu_items", []);
+  }
   const locale = req.getLocale();
   const __ = (s) => state.i18n.__({ phrase: s, locale }) || s;
   const transform = (items) =>
@@ -27,6 +30,7 @@ const get_extra_menu = (role, state, req) => {
         icon: item.icon,
         location: item.location,
         style: item.style || "",
+        type: item.type,
         link:
           item.type === "Link"
             ? item.url