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

package/app.js

@@ -23,10 +23,10 @@ const {
   available_languages,
 } = require("@saltcorn/data/models/config");
 const {
-  setTenant,
   get_base_url,
   error_catcher,
   getSessionStore,
+  setTenant,
 } = require("./routes/utils.js");
 const path = require("path");
 const fileUpload = require("express-fileupload");
@@ -37,6 +37,7 @@ const { I18n } = require("i18n");
 const { h1 } = require("@saltcorn/markup/tags");
 const is = require("contractis/is");
 const Trigger = require("@saltcorn/data/models/trigger");
+const s3storage = require("./s3storage");
 
 const locales = Object.keys(available_languages);
 // i18n configuration
@@ -77,15 +78,6 @@ const getApp = async (opts = {}) => {
   // extenetede url encoding in use
   app.use(express.urlencoded({ limit: "5mb", extended: true }));
 
-  // add fileupload feature
-  // todo ability to configure filetmp dir - add new config / env parameter
-  app.use(
-    fileUpload({
-      useTempFiles: true,
-      createParentPath: true,
-      tempFileDir: "/tmp/",
-    })
-  );
   // cookies
   app.use(require("cookie-parser")());
   // i18n support
@@ -202,6 +194,12 @@ const getApp = async (opts = {}) => {
   passport.deserializeUser(function (user, done) {
     done(null, user);
   });
+  app.use(setTenant);
+
+  // Change into s3storage compatible selector
+  // existing fileupload middleware is moved into s3storage.js
+  app.use(s3storage.middlewareSelect);
+  app.use(s3storage.middlewareTransform);
 
   app.use(wrapper(version_tag));
   const csurf = csrf();
@@ -218,11 +216,10 @@ const getApp = async (opts = {}) => {
 
   mountRoutes(app);
   // set tenant homepage as / root
-  app.get("/", setTenant, error_catcher(homepage));
+  app.get("/", error_catcher(homepage));
   // /robots.txt
   app.get(
     "/robots.txt",
-    setTenant,
     error_catcher(async (req, res) => {
       const base = get_base_url(req);
       res.set("Content-Type", "text/plain");
@@ -235,7 +232,6 @@ Sitemap: ${base}sitemap.xml
   // /sitemap.xml
   app.get(
     "/sitemap.xml",
-    setTenant,
     error_catcher(async (req, res) => {
       const base = get_base_url(req);
       res.set("Content-Type", "text/xml");

package/auth/admin.js

@@ -50,8 +50,8 @@ const router = new Router();
 module.exports = router;
 
 /**
- * 
- * @param {object} req 
+ *
+ * @param {object} req
  * @returns {Promise<object>}
  */
 const getUserFields = async (req) => {
@@ -221,7 +221,6 @@ const user_dropdown = (user, req, can_reset) =>
  */
 router.get(
   "/",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const users = await User.find({}, { orderBy: "id" });
@@ -286,7 +285,6 @@ router.get(
  */
 router.get(
   "/new",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const form = await userForm(req);
@@ -305,8 +303,8 @@ router.get(
 );
 
 /**
- * 
- * @param {object} req 
+ *
+ * @param {object} req
  * @returns {Form}
  */
 const user_settings_form = (req) =>
@@ -322,6 +320,7 @@ const user_settings_form = (req) =>
       "verification_view",
       "elevate_verified",
       "min_role_upload",
+      "min_role_apikeygen",
       "timeout",
       "email_mask",
       "allow_forgot",
@@ -341,7 +340,6 @@ const user_settings_form = (req) =>
  */
 router.get(
   "/settings",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const form = await user_settings_form(req);
@@ -365,7 +363,6 @@ router.get(
  */
 router.post(
   "/settings",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const form = await user_settings_form(req);
@@ -396,7 +393,6 @@ router.post(
  */
 router.get(
   "/ssl",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const isRoot = db.getTenantSchema() === db.connectObj.default_schema;
@@ -511,7 +507,7 @@ router.get(
 );
 
 /**
- * @param {object} req 
+ * @param {object} req
  * @returns {Form}
  */
 const ssl_form = (req) =>
@@ -528,7 +524,6 @@ const ssl_form = (req) =>
  */
 router.get(
   "/ssl/custom",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const form = await ssl_form(req);
@@ -553,7 +548,6 @@ router.get(
  */
 router.post(
   "/ssl/custom",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const form = await ssl_form(req);
@@ -590,7 +584,6 @@ router.post(
  */
 router.get(
   "/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -624,7 +617,7 @@ router.get(
               ),
               // button for reset or generate api token
               div(
-                { class: "mt-4" },
+                { class: "mt-4 d-inline-block" },
                 post_btn(
                   `/useradmin/gen-api-token/${user.id}`,
                   user.api_token ? req.__("Reset") : req.__("Generate"),
@@ -634,7 +627,7 @@ router.get(
               // button for remove api token
               user.api_token &&
                 div(
-                  { class: "mt-4" },
+                  { class: "mt-4 ml-2 d-inline-block" },
                   post_btn(
                     `/useradmin/remove-api-token/${user.id}`,
                     // TBD localization
@@ -659,7 +652,6 @@ router.get(
  */
 router.post(
   "/save",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     let form, sub2;
@@ -738,7 +730,6 @@ router.post(
  */
 router.post(
   "/reset-password/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -758,7 +749,6 @@ router.post(
  */
 router.post(
   "/send-verification/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -783,7 +773,6 @@ router.post(
  */
 router.post(
   "/gen-api-token/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -803,7 +792,6 @@ router.post(
  */
 router.post(
   "/remove-api-token/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -823,7 +811,6 @@ router.post(
  */
 router.post(
   "/set-random-password/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -847,7 +834,6 @@ router.post(
  */
 router.post(
   "/disable/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -866,7 +852,6 @@ router.post(
  */
 router.post(
   "/enable/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -884,7 +869,6 @@ router.post(
  */
 router.post(
   "/delete/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;

package/auth/roleadmin.js

@@ -20,12 +20,7 @@ const {
   post_dropdown_item,
   post_delete_btn,
 } = require("@saltcorn/markup");
-const {
-  isAdmin,
-  setTenant,
-  error_catcher,
-  csrfField,
-} = require("../routes/utils");
+const { isAdmin, error_catcher, csrfField } = require("../routes/utils");
 const { send_reset_email } = require("./resetpw");
 const { getState } = require("@saltcorn/data/db/state");
 const {
@@ -61,10 +56,10 @@ const router = new Router();
 module.exports = router;
 
 /**
- * @param {Role} role 
- * @param {Layout[]} layouts 
- * @param {*} layout_by_role 
- * @param {object} req 
+ * @param {Role} role
+ * @param {Layout[]} layouts
+ * @param {*} layout_by_role
+ * @param {object} req
  * @returns {Form}
  */
 const editRoleLayoutForm = (role, layouts, layout_by_role, req) =>
@@ -91,7 +86,7 @@ const editRoleLayoutForm = (role, layouts, layout_by_role, req) =>
   );
 
 /**
- * @param {object} req 
+ * @param {object} req
  * @returns {Form}
  */
 const roleForm = (req) =>
@@ -119,7 +114,6 @@ const roleForm = (req) =>
  */
 router.get(
   "/",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const roles = await User.get_roles();
@@ -172,7 +166,6 @@ router.get(
  */
 router.get(
   "/new",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const form = await roleForm(req);
@@ -198,7 +191,6 @@ router.get(
  */
 router.post(
   "/edit",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const form = await roleForm(req);
@@ -236,7 +228,6 @@ router.post(
  */
 router.post(
   "/setrolelayout/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;
@@ -257,7 +248,6 @@ const unDeletableRoles = [1, 8, 10];
  */
 router.post(
   "/delete/:id",
-  setTenant,
   isAdmin,
   error_catcher(async (req, res) => {
     const { id } = req.params;