@saltcorn/server 1.1.3-beta.9 → 1.1.3-rc.0

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ## 1.1.3 - In beta
 
+* A POST route for the reload management api (`/scapi/reload`) which takes as body JSON
+  a newly created tenant with `saltcorn create-tenant` CLI (`new_tenant` JSON key) or an
+  existing tenant (`tenant` JSON key) to reload.
+
+* User authentication methods (password, external identity providers) can 
+  now be disabled by role
+
+* Customize reset password email, under Login and Signup settings
+
+* Snapshot and restore code pages; show code page compilation error; expand code 
+  editor height to fill screeen.
+
 * Toast action can now set the title
 
 * List view: Row click can now open in a new tab, in a popup, or can run an action.
@@ -21,6 +33,7 @@
 * Fix serving JSDoc (Table, File, User links in run_js_code)
 * Destination redirect on login now works on custom login forms and with external identity providers
 * insert_any_row now works from pages
+* Fix various capacitor build errors.
 
 ## 1.1.2 - Released 4 March 2025
 

package/auth/admin.js

@@ -365,6 +365,7 @@ const auth_settings_form = async (req) =>
       "new_user_form",
       "user_settings_form",
       "verification_view",
+      "reset_password_email_view",
       { section_header: req.__("Additional login and signup settings") },
       "logout_url",
       "signup_role",

package/auth/resetpw.js

@@ -4,8 +4,12 @@
  * @subcategory auth
  */
 const { getState } = require("@saltcorn/data/db/state");
-const { getMailTransport } = require("@saltcorn/data/models/email");
+const {
+  getMailTransport,
+  viewToEmailHtml,
+} = require("@saltcorn/data/models/email");
 const { get_base_url } = require("../routes/utils");
+const View = require("@saltcorn/data/models/view");
 
 /**
  * @param {string} link
@@ -23,13 +27,13 @@ const generate_email = (link, user, req, options) => {
         getState().getConfig("site_name", "Saltcorn")
       )
     : options?.from_admin
-    ? req.__(
-        "We request that you change your password on %s. You can set your new password through this link: ",
-        getState().getConfig("site_name", "Saltcorn")
-      )
-    : req.__(
-        "You have requested a link to change your password. You can do this through this link:"
-      );
+      ? req.__(
+          "We request that you change your password on %s. You can set your new password through this link: ",
+          getState().getConfig("site_name", "Saltcorn")
+        )
+      : req.__(
+          "You have requested a link to change your password. You can do this through this link:"
+        );
   const base_url = getState().getConfig("base_url", "");
   const final =
     options?.creating && base_url
@@ -94,7 +98,31 @@ ${final ? `<br />${final}<br />` : ""}
 const send_reset_email = async (user, req, options = {}) => {
   const link = await get_reset_link(user, req);
   const transporter = getMailTransport();
-  await transporter.sendMail(generate_email(link, user, req, options));
+  const reset_password_email_view_name = getState().getConfig(
+    "reset_password_email_view",
+    false
+  );
+  let email;
+  if (reset_password_email_view_name) {
+    const reset_password_email_view = await View.findOne({
+      name: reset_password_email_view_name,
+    });
+    if (reset_password_email_view) {
+      const html = await viewToEmailHtml(reset_password_email_view, {
+        id: user.id,
+      });
+      email = {
+        from: getState().getConfig("email_from"),
+        to: user.email,
+        subject:
+          reset_password_email_view.attributes?.page_title ||
+          `${req.__("Hi %s", user.email)}`,
+        html,
+      };
+    }
+  }
+  if (!email) email = generate_email(link, user, req, options);
+  await transporter.sendMail(email);
 };
 
 /**

package/auth/roleadmin.js

@@ -15,6 +15,7 @@ const {
   link,
   post_delete_btn,
 } = require("@saltcorn/markup");
+const { dropdown_checkboxes } = require("@saltcorn/markup/helpers");
 const { isAdmin, error_catcher, csrfField } = require("../routes/utils");
 const { getState } = require("@saltcorn/data/db/state");
 const { text, form, option, select, a, i } = require("@saltcorn/markup/tags");
@@ -147,6 +148,17 @@ router.get(
     );
     const layout_by_role = getState().getConfig("layout_by_role");
     const twofa_policy_by_role = getState().getConfig("twofa_policy_by_role");
+    const auth_methods = Object.keys(getState().auth_methods);
+
+    auth_methods.unshift("Password");
+    const auth_enabled_by_role = {};
+    for (const role of roles) {
+      if (role.id === 100) continue;
+      auth_enabled_by_role[role.id] = getState().get_auth_enabled_by_role(
+        role.id
+      );
+    }
+
     send_users_page({
       res,
       req,
@@ -173,6 +185,28 @@ router.get(
                     ? ""
                     : editRole2FAPolicyForm(role, twofa_policy_by_role, req),
               },
+              ...(auth_methods.length > 1
+                ? [
+                    {
+                      label: req.__("Allow login methods"),
+                      key: (role) =>
+                        role.id === 100
+                          ? ""
+                          : dropdown_checkboxes({
+                              btnClass: "btn-outline-secondary btn-sm",
+                              btnLabel: Object.entries(
+                                auth_enabled_by_role[role.id]
+                              )
+                                .filter(([method, enabled]) => enabled)
+                                .map(([method, enabled]) => method)
+                                .join(", "),
+                              items: auth_methods,
+                              checked: auth_enabled_by_role[role.id],
+                              onChange: `editAllowedAuthByRole(${role.id}, event)`,
+                            }),
+                    },
+                  ]
+                : []),
               {
                 label: req.__("Delete"),
                 key: (r) =>
@@ -293,6 +327,23 @@ router.post(
     res.redirect(`/roleadmin`);
   })
 );
+
+router.post(
+  "/setrole_allowed_auth_methods/:id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { id } = req.params;
+    const enabled = (req.body || {}).enabled;
+    const method = (req.body || {}).method;
+
+    const auth_method_by_role = getState().getConfigCopy("auth_method_by_role");
+    if (!auth_method_by_role[+id]) auth_method_by_role[+id] = {};
+    auth_method_by_role[+id][method] = enabled;
+    await getState().setConfig("auth_method_by_role", auth_method_by_role);
+    res.json({ success: true });
+  })
+);
+
 const unDeletableRoles = [1, 80, 100];
 /**
  * @name post/delete/:id

package/auth/routes.js

@@ -474,6 +474,13 @@ router.post(
         respond();
         return;
       }
+      const auth_method_enabled = getState().get_auth_enabled_by_role(
+        u.role_id
+      );
+      if (auth_method_enabled?.Password === false) {
+        respond();
+        return;
+      }
       //send email
       await send_reset_email(u, req);
 
@@ -1496,7 +1503,7 @@ const userSettings = async ({ req, res, pwform, user }) => {
         : "",
     ],
   };
-
+  const auth_method_enabled = getState().get_auth_enabled_by_role(user.role_id);
   return {
     above: [
       {
@@ -1527,7 +1534,7 @@ const userSettings = async ({ req, res, pwform, user }) => {
           )
         ),
       },
-      ...(user.password
+      ...(user.password && auth_method_enabled?.Password !== false
         ? [
             {
               type: "card",