@saltcorn/server 0.8.0-beta.0 → 0.8.0-beta.1

package/auth/admin.js

@@ -5,9 +5,6 @@
  * @subcategory auth
  */
 // todo refactor to few modules + rename to be in sync with router url
-/**
- * @type {module:express-promise-router}
- */
 const Router = require("express-promise-router");
 const { contract, is } = require("contractis");
 
@@ -24,10 +21,10 @@ const {
   settingsDropdown,
   post_dropdown_item,
 } = require("@saltcorn/markup");
-const { isAdmin, setTenant, error_catcher } = require("../routes/utils");
+const { isAdmin, error_catcher } = require("../routes/utils");
 const { send_reset_email } = require("./resetpw");
 const { getState } = require("@saltcorn/data/db/state");
-const { a, div, text, span, code, h5, i, p } = require("@saltcorn/markup/tags");
+const { a, div, span, code, h5, i, p } = require("@saltcorn/markup/tags");
 const Table = require("@saltcorn/data/models/table");
 const {
   send_users_page,
@@ -217,6 +214,7 @@ const user_dropdown = (user, req, can_reset) =>
   ]);
 
 /**
+ * Users List (HTTP Get)
  * @name get
  * @function
  * @memberof module:auth/admin~auth/adminRouter
@@ -227,8 +225,8 @@ router.get(
   error_catcher(async (req, res) => {
     const users = await User.find({}, { orderBy: "id" });
     const roles = await User.get_roles();
-    var roleMap = {};
-    roles.forEach((r) => {
+    let roleMap = {};
+    roles.forEach(r => {
       roleMap[r.id] = r.role;
     });
     const can_reset = getState().getConfig("smtp_host", "") !== "";
@@ -305,37 +303,67 @@ router.get(
 );
 
 /**
- *
+ * Authentication Setting Form
+ * @param {object} req
+ * @returns {Form}
+ */
+const auth_settings_form = async (req) =>
+    await config_fields_form({
+        req,
+        field_names: [
+            "allow_signup",
+            "login_menu",
+            "allow_forgot",
+            "new_user_form",
+            "login_form",
+            "signup_form",
+            "user_settings_form",
+            "verification_view",
+            "elevate_verified",
+            "email_mask",
+        ],
+        action: "/useradmin/settings",
+        submitLabel: req.__("Save"),
+    });
+
+/**
+ * HTTP Settings Form
  * @param {object} req
  * @returns {Form}
  */
-const user_settings_form = (req) =>
-  config_fields_form({
-    req,
-    field_names: [
-      "allow_signup",
-      "login_menu",
-      "new_user_form",
-      "login_form",
-      "signup_form",
-      "user_settings_form",
-      "verification_view",
-      "elevate_verified",
-      "min_role_upload",
-      "min_role_apikeygen",
-      "timeout",
-      "email_mask",
-      "allow_forgot",
-      "cookie_duration",
-      "cookie_duration_remember",
-      "cookie_sessions",
-      "custom_http_headers",
-    ],
-    action: "/useradmin/settings",
-    submitLabel: req.__("Save"),
-  });
+const http_settings_form = async (req) =>
+    await config_fields_form({
+        req,
+        field_names: [
+            "timeout",
+            "cookie_duration",
+            "cookie_duration_remember",
+            "cookie_sessions",
+            "custom_http_headers",
+        ],
+        action: "/useradmin/http",
+        submitLabel: req.__("Save"),
+    });
+
 
 /**
+ * Permissions Setting Form
+ * @param {object} req
+ * @returns {Form}
+ */
+const permissions_settings_form = async (req) =>
+    await config_fields_form({
+        req,
+        field_names: [
+            "min_role_upload",
+            "min_role_apikeygen",
+        ],
+        action: "/useradmin/permissions",
+        submitLabel: req.__("Save"),
+    });
+
+/**
+ * HTTP GET for /useradmin/settings
  * @name get/settings
  * @function
  * @memberof module:auth/admin~auth/adminRouter
@@ -344,7 +372,7 @@ router.get(
   "/settings",
   isAdmin,
   error_catcher(async (req, res) => {
-    const form = await user_settings_form(req);
+    const form = await auth_settings_form(req);
     send_users_page({
       res,
       req,
@@ -359,6 +387,7 @@ router.get(
 );
 
 /**
+ * HTTP POST for /useradmin/settings
  * @name post/settings
  * @function
  * @memberof module:auth/admin~auth/adminRouter
@@ -367,7 +396,7 @@ router.post(
   "/settings",
   isAdmin,
   error_catcher(async (req, res) => {
-    const form = await user_settings_form(req);
+    const form = await auth_settings_form(req);
     form.validate(req.body);
     if (form.hasErrors) {
       send_users_page({
@@ -382,7 +411,7 @@ router.post(
       });
     } else {
       await save_config_from_form(form);
-      req.flash("success", req.__("User settings updated"));
+      req.flash("success", req.__("Authentication settings updated"));
       if (!req.xhr) res.redirect("/useradmin/settings");
       else res.json({ success: "ok" });
     }
@@ -390,6 +419,119 @@ router.post(
 );
 
 /**
+ * HTTP GET for /useradmin/http
+ * @name get/settings
+ * @function
+ * @memberof module:auth/admin~auth/adminRouter
+ */
+router.get(
+    "/http",
+    isAdmin,
+    error_catcher(async (req, res) => {
+        const form = await http_settings_form(req);
+        send_users_page({
+            res,
+            req,
+            active_sub: "HTTP",
+            contents: {
+                type: "card",
+                title: req.__("HTTP settings"),
+                contents: [renderForm(form, req.csrfToken())],
+            },
+        });
+    })
+);
+
+/**
+ * HTTP POST for /useradmin/http
+ * @name post/settings
+ * @function
+ * @memberof module:auth/admin~auth/adminRouter
+ */
+router.post(
+    "/http",
+    isAdmin,
+    error_catcher(async (req, res) => {
+        const form = await http_settings_form(req);
+        form.validate(req.body);
+        if (form.hasErrors) {
+            send_users_page({
+                res,
+                req,
+                active_sub: "HTTP",
+                contents: {
+                    type: "card",
+                    title: req.__("HTTP settings"),
+                    contents: [renderForm(form, req.csrfToken())],
+                },
+            });
+        } else {
+            await save_config_from_form(form);
+            req.flash("success", req.__("HTTP settings updated"));
+            if (!req.xhr) res.redirect("/useradmin/http");
+            else res.json({ success: "ok" });
+        }
+    })
+);
+
+/**
+ * HTTP GET for /useradmin/permissions
+ * @name get/settings
+ * @function
+ * @memberof module:auth/admin~auth/adminRouter
+ */
+router.get(
+    "/permissions",
+    isAdmin,
+    error_catcher(async (req, res) => {
+        const form = await permissions_settings_form(req);
+        send_users_page({
+            res,
+            req,
+            active_sub: "Permissions",
+            contents: {
+                type: "card",
+                title: req.__("Permissions settings"),
+                contents: [renderForm(form, req.csrfToken())],
+            },
+        });
+    })
+);
+
+/**
+ * HTTP POST for /useradmin/permissions
+ * @name post/settings
+ * @function
+ * @memberof module:auth/admin~auth/adminRouter
+ */
+router.post(
+    "/permissions",
+    isAdmin,
+    error_catcher(async (req, res) => {
+        const form = await permissions_settings_form(req);
+        form.validate(req.body);
+        if (form.hasErrors) {
+            send_users_page({
+                res,
+                req,
+                active_sub: "Permissions",
+                contents: {
+                    type: "card",
+                    title: req.__("Permissions settings"),
+                    contents: [renderForm(form, req.csrfToken())],
+                },
+            });
+        } else {
+            await save_config_from_form(form);
+            req.flash("success", req.__("Permissions settings updated"));
+            if (!req.xhr) res.redirect("/useradmin/permissions");
+            else res.json({ success: "ok" });
+        }
+    })
+);
+
+/**
+ * HTTP GET for /useradmin/ssl
  * @name get/ssl
  * @function
  * @memberof module:auth/admin~auth/adminRouter
@@ -510,17 +652,19 @@ router.get(
 );
 
 /**
+ * SSL Setting form
  * @param {object} req
  * @returns {Form}
  */
-const ssl_form = (req) =>
-  config_fields_form({
-    req,
-    field_names: ["custom_ssl_certificate", "custom_ssl_private_key"],
-    action: "/useradmin/ssl/custom",
-  });
+const ssl_form = async (req) =>
+    await config_fields_form({
+        req,
+        field_names: ["custom_ssl_certificate", "custom_ssl_private_key"],
+        action: "/useradmin/ssl/custom",
+    });
 
 /**
+ * HTTP GET for /useradmin/ssl/custom
  * @name get/ssl/custom
  * @function
  * @memberof module:auth/admin~auth/adminRouter
@@ -545,6 +689,7 @@ router.get(
 );
 
 /**
+ * HTTP POST for /useradmin/ssl/custom
  * @name post/ssl/custom
  * @function
  * @memberof module:auth/admin~auth/adminRouter
@@ -583,6 +728,7 @@ router.post(
 );
 
 /**
+ * HTTP GET for /useradmin/table-access
  * @name get/ssl/custom
  * @function
  * @memberof module:auth/admin~auth/adminRouter
@@ -806,7 +952,7 @@ router.post(
         role_id: +role_id,
         ...rest,
       });
-      // refactored to catch user errors errors and stop processing if any errors
+      // refactored to catch user errors and stop processing if any errors
       if (u.error) {
         req.flash("error", u.error); // todo change to prompt near field like done for views
         // todo return to create user form
@@ -826,7 +972,7 @@ router.post(
 );
 
 /**
- * Reset password for yser
+ * Reset password for user
  * @name post/reset-password/:id
  * @function
  * @memberof module:auth/admin~auth/adminRouter
@@ -856,8 +1002,13 @@ router.post(
   error_catcher(async (req, res) => {
     const { id } = req.params;
     const u = await User.findOne({ id });
-    const result = await send_verification_email(u);
-    if (result.error) req.flash("danger", result.error);
+    // todo add test case
+    const result = await send_verification_email(u, req);
+    if (result.error)
+        req.flash(
+            "danger",
+            req.__(`Verification email sender error:`, result.error)
+        );
     else
       req.flash(
         "success",

package/auth/roleadmin.js

@@ -4,45 +4,27 @@
  * @subcategory auth
  */
 const Router = require("express-promise-router");
-const { contract, is } = require("contractis");
 
-const db = require("@saltcorn/data/db");
+//const db = require("@saltcorn/data/db");
 const User = require("@saltcorn/data/models/user");
 const Role = require("@saltcorn/data/models/role");
-const Field = require("@saltcorn/data/models/field");
 const Form = require("@saltcorn/data/models/form");
 const {
   mkTable,
   renderForm,
   link,
-  post_btn,
-  settingsDropdown,
-  post_dropdown_item,
   post_delete_btn,
 } = require("@saltcorn/markup");
 const { isAdmin, error_catcher, csrfField } = require("../routes/utils");
-const { send_reset_email } = require("./resetpw");
 const { getState } = require("@saltcorn/data/db/state");
 const {
-  a,
-  div,
-  button,
   text,
-  span,
-  code,
   form,
   option,
   select,
-  br,
-  h4,
-  h5,
-  p,
 } = require("@saltcorn/markup/tags");
-const Table = require("@saltcorn/data/models/table");
 const {
   send_users_page,
-  config_fields_form,
-  save_config_from_form,
 } = require("../markup/admin");
 
 /**
@@ -77,7 +59,7 @@ const editRoleLayoutForm = (role, layouts, layout_by_role, req) =>
             value: layout,
             ...((layout_by_role[role.id]
               ? layout_by_role[role.id] === layout
-              : ix == layouts.length - 1) && { selected: true }),
+              : ix === layouts.length - 1) && { selected: true }),
           },
           text(layout)
         )
@@ -86,9 +68,9 @@ const editRoleLayoutForm = (role, layouts, layout_by_role, req) =>
   );
 
 /**
+ *
  * @param {Role} role
- * @param {Layout[]} layouts
- * @param {*} layout_by_role
+ * @param twofa_policy_by_role
  * @param {object} req
  * @returns {Form}
  */
@@ -139,7 +121,7 @@ router.get(
   isAdmin,
   error_catcher(async (req, res) => {
     const roles = await User.get_roles();
-    var roleMap = {};
+    let roleMap = {};
     roles.forEach((r) => {
       roleMap[r.id] = r.role;
     });