@saltcorn/server 1.1.3-beta.0 → 1.1.3-beta.10

package/CHANGELOG.md

@@ -2,14 +2,31 @@
 
 ## 1.1.3 - In beta
 
+* 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.
+
+* Create basic views: if a table had no views, a button on the table page 
+  allows you to build basic views for the table with a single click
+
 * Workflows: 
     - UserForm new question type: Multiple checks
     - Options for Multiple checks and Multiple choice can use interpolations (`{{ }}`)
       so options can be dynamically generated from the context
+    - Improve UX for editing For Loops.
+    - UserForm multiple choice switch to dropdown if >5 options
 
 ### Fixes
 
 * 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/app.js

@@ -44,14 +44,9 @@ const ExtractJwt = require("passport-jwt").ExtractJwt;
 const cors = require("cors");
 const api = require("./routes/api");
 const scapi = require("./routes/scapi");
+const fs = require("fs");
 
 const locales = Object.keys(available_languages);
-// i18n configuration
-const i18n = new I18n({
-  locales,
-  directory: path.join(__dirname, "locales"),
-  mustacheConfig: { disable: true },
-});
 // jwt config
 const jwt_secret = db.connectObj.jwt_secret;
 const jwt_extractor = ExtractJwt.fromExtractors([
@@ -186,6 +181,43 @@ const getApp = async (opts = {}) => {
 
   // cookies
   app.use(require("cookie-parser")());
+
+  // i18n configuration
+
+  let i18n;
+
+  if (getState().getConfig("development_mode")) {
+    // i18n configuration
+    i18n = new I18n({
+      locales,
+      directory: path.join(__dirname, "locales"),
+      mustacheConfig: { disable: true },
+      defaultLocale: getState().getConfig("default_locale"),
+    });
+  } else {
+    const staticCatalog = {};
+    for (const locale of locales) {
+      staticCatalog[locale] = require(`./locales/${locale}.json`);
+    }
+
+    for (const [nm, loc] of Object.entries(getState().plugin_locations))
+      if (fs.existsSync(path.join(loc, "locales")))
+        for (const locale of locales)
+          if (fs.existsSync(path.join(loc, "locales", `${locale}.json`))) {
+            const xlations = JSON.parse(
+              fs.readFileSync(path.join(loc, "locales", `${locale}.json`))
+            );          
+            Object.assign(staticCatalog[locale], xlations);
+          }
+
+    i18n = new I18n({
+      locales,
+      staticCatalog,
+      mustacheConfig: { disable: true },
+      defaultLocale: getState().getConfig("default_locale"),
+    });
+  }
+
   // i18n support
   app.use(i18n.init);
   // init multitenant mode

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",
@@ -1044,6 +1045,7 @@ router.post(
         await u.update({ email, role_id, ...rest });
         req.flash("success", req.__(`User %s saved`, email));
       } catch (e) {
+        console.error(e);
         req.flash("error", req.__(`Error editing user: %s`, e.message));
       }
     } else {

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

@@ -315,6 +315,7 @@ router.post(
         await u.delete();
         req.flash("success", req.__(`Role %s deleted`, u.role));
       } catch (e) {
+        console.error(e);
         req.flash("error", e.message);
       }
     }

package/auth/routes.js

@@ -197,7 +197,7 @@ const resetForm = (body, req) => {
  * @param {boolean} noMethods
  * @returns {object}
  */
-const getAuthLinks = (current, noMethods) => {
+const getAuthLinks = (current, noMethods, req) => {
   const links = { methods: [] };
   const state = getState();
   if (current !== "login") links.login = "/auth/login";
@@ -205,11 +205,14 @@ const getAuthLinks = (current, noMethods) => {
     links.signup = "/auth/signup";
   if (current !== "forgot" && state.getConfig("allow_forgot"))
     links.forgot = "/auth/forgot";
+  const dest = req?.query?.dest
+    ? `?dest=${encodeURIComponent(req.query.dest)}`
+    : "";
   if (!noMethods)
     Object.entries(getState().auth_methods).forEach(([name, auth]) => {
       const url = auth.postUsernamePassword
-        ? `javascript:$('form.login').attr('action','/auth/login-with/${name}').submit();`
-        : `/auth/login-with/${name}`;
+        ? `javascript:$('form.login').attr('action','/auth/login-with/${name}${dest}').submit();`
+        : `/auth/login-with/${name}${dest}`;
       links.methods.push({
         icon: auth.icon,
         label: auth.label,
@@ -303,7 +306,7 @@ router.get(
         res.sendAuthWrap(
           req.__(`Login`),
           loginForm(req),
-          getAuthLinks("login")
+          getAuthLinks("login", false, req)
         );
       else {
         const resp = await login_form.run_possibly_on_page(
@@ -311,13 +314,13 @@ router.get(
           req,
           res,
           false,
-          true
+          { hiddenLoginDest: true }
         );
         if (!resp) {
           res.sendAuthWrap(
             req.__(`Login`),
             loginForm(req),
-            getAuthLinks("login")
+            getAuthLinks("login", false, req)
           );
         } else if (login_form.default_render_page) {
           const page = Page.findOne({ name: login_form.default_render_page });
@@ -328,7 +331,11 @@ router.get(
         } else res.sendAuthWrap(req.__(`Login`), resp, { methods: [] });
       }
     } else
-      res.sendAuthWrap(req.__(`Login`), loginForm(req), getAuthLinks("login"));
+      res.sendAuthWrap(
+        req.__(`Login`),
+        loginForm(req),
+        getAuthLinks("login", false, req)
+      );
   })
 );
 
@@ -585,7 +592,6 @@ router.get(
           language: req.__({ phrase: "Language", locale }),
           email: req.__({ phrase: "E-mail", locale }),
           password: req.__({ phrase: "Password", locale }),
-
         };
       });
 
@@ -1217,6 +1223,7 @@ router.get(
     } else {
       const auth = getState().auth_methods[method];
       if (auth) {
+        if (req.query?.dest) res.cookie("login_dest", req.query.dest);
         const passportParams =
           typeof auth.parameters === "function"
             ? auth.parameters(req)
@@ -1259,6 +1266,7 @@ router.post(
         typeof auth.parameters === "function"
           ? auth.parameters(req)
           : auth.parameters;
+      if (req.query?.dest) res.cookie("login_dest", req.query.dest);
       passport.authenticate(method, passportParams)(
         req,
         res,
@@ -1289,6 +1297,12 @@ const loginCallback = (req, res) => () => {
   } else {
     Trigger.emitEvent("Login", null, req.user);
     req.flash("success", req.__("Welcome, %s!", req.user.email));
+    if (req.cookies["login_dest"]) {
+      res.clearCookie("login_dest");
+      res.redirect(req.cookies["login_dest"]);
+      return;
+    }
+
     res.redirect("/");
   }
 };