@saltcorn/server 0.7.3-beta.6 → 0.7.4-beta.0

package/auth/admin.js

@@ -381,7 +381,8 @@ router.post(
     } else {
       await save_config_from_form(form);
       req.flash("success", req.__("User settings updated"));
-      res.redirect("/useradmin/settings");
+      if (!req.xhr) res.redirect("/useradmin/settings");
+      else res.json({ success: "ok" });
     }
   })
 );
@@ -530,7 +531,7 @@ router.get(
     send_users_page({
       res,
       req,
-      active_sub: "Settings",
+      active_sub: "SSL",
       contents: {
         type: "card",
         title: req.__("Authentication settings"),
@@ -556,7 +557,7 @@ router.post(
       send_users_page({
         res,
         req,
-        active_sub: "Settings",
+        active_sub: "SSL",
         contents: {
           type: "card",
           title: req.__("Authentication settings"),
@@ -572,7 +573,9 @@ router.post(
           " " +
           a({ href: "/admin/system" }, req.__("Restart here"))
       );
-      res.redirect("/useradmin/ssl");
+      if (!req.xhr) {
+        res.redirect("/useradmin/ssl");
+      } else res.json({ success: "ok" });
     }
   })
 );
@@ -690,7 +693,8 @@ router.post(
     } = form.values;
     if (id) {
       try {
-        await db.update("users", { email, role_id, ...rest }, id);
+        const u = await User.findOne({ id });
+        await u.update({ email, role_id, ...rest });
         req.flash("success", req.__(`User %s saved`, email));
       } catch (e) {
         req.flash("error", req.__(`Error editing user: %s`, e.message));

package/auth/routes.js

@@ -199,24 +199,33 @@ const getAuthLinks = (current, noMethods) => {
   return links;
 };
 
-const loginWithJwt = async (req, res) => {
-  const { email, password } = req.query;
+const loginWithJwt = async (email, password, res) => {
   const user = await User.findOne({ email });
   if (user && user.checkPassword(password)) {
-    const now = new Date().valueOf();
+    const now = new Date();
     const jwt_secret = db.connectObj.jwt_secret;
     const token = jwt.sign(
       {
         sub: email,
-        role_id: user.role_id,
+        user: {
+          id: user.id,
+          email: user.email,
+          role_id: user.role_id,
+          language: user.language ? user.language : "en",
+          disabled: user.disabled,
+        },
         iss: "saltcorn@saltcorn",
         aud: "saltcorn-mobile-app",
-        iat: now,
+        iat: now.valueOf(),
       },
       jwt_secret
     );
-    if (!user.last_mobile_login) user.updateLastMobileLogin(now);
+    if (!user.last_mobile_login) await user.updateLastMobileLogin(now);
     res.json(token);
+  } else {
+    res.json({
+      alerts: [{ type: "danger", msg: "Incorrect user or password" }],
+    });
   }
 };
 
@@ -900,8 +909,8 @@ router.post(
       } else {
         const u = await User.create({ email, password });
         await send_verification_email(u, req);
-
-        signup_login_with_user(u, req, res);
+        if (req.smr) await loginWithJwt(email, password, res);
+        else signup_login_with_user(u, req, res);
       }
     }
   })
@@ -1008,7 +1017,8 @@ router.get(
   error_catcher(async (req, res, next) => {
     const { method } = req.params;
     if (method === "jwt") {
-      await loginWithJwt(req, res);
+      const { email, password } = req.query;
+      await loginWithJwt(email, password, res);
     } else {
       const auth = getState().auth_methods[method];
       if (auth) {

package/errors.js

@@ -7,55 +7,58 @@ const { pre, p, text, h3 } = require("@saltcorn/markup/tags");
 const Crash = require("@saltcorn/data/models/crash");
 const { getState } = require("@saltcorn/data/db/state");
 
-module.exports = 
-/**
- * 
- * @param {object} err 
- * @param {object} req 
- * @param {object} res 
- * @param {*} next 
- * @returns {Promise<void>}
- */
-async function (err, req, res, next) {
-  if (!req.__) req.__ = (s) => s;
+module.exports =
+  /**
+   *
+   * @param {object} err
+   * @param {object} req
+   * @param {object} res
+   * @param {*} next
+   * @returns {Promise<void>}
+   */
+  async function (err, req, res, next) {
+    if (!req.__) req.__ = (s) => s;
 
-  const devmode = getState().getConfig("development_mode", false);
-  const log_sql = getState().getConfig("log_sql", false);
-  const role = (req.user || {}).role_id || 10;
-  if (err.message && err.message.includes("invalid csrf token")) {
-    console.error(err.message);
+    const devmode = getState().getConfig("development_mode", false);
+    const log_sql = getState().getConfig("log_sql", false);
+    const role = (req.user || {}).role_id || 10;
+    if (err.message && err.message.includes("invalid csrf token")) {
+      console.error(err.message);
 
-    req.flash("error", req.__("Invalid form data, try again"));
-    if (req.url && req.url.includes("/auth/login")) res.redirect("/auth/login");
-    else res.redirect("/");
-    return;
-  }
-  const code = err.httpCode || 500;
-  const headline = err.headline || "An error occurred";
-  const severity = err.severity || 2;
-  const createCrash = severity <= 3;
-  console.error(err.stack);
-  if (!(devmode && log_sql) && createCrash) await Crash.create(err, req);
+      req.flash("error", req.__("Invalid form data, try again"));
+      if (req.url && req.url.includes("/auth/login"))
+        res.redirect("/auth/login");
+      else res.redirect("/");
+      return;
+    }
+    const code = err.httpCode || 500;
+    const headline = err.headline || "An error occurred";
+    const severity = err.severity || 2;
+    const createCrash = severity <= 3;
+    //console.error(err.stack);
+    if (!(devmode && log_sql) && createCrash) await Crash.create(err, req);
 
-  if (req.xhr) {
-    res
-      .status(code)
-      .send(
-        devmode || role === 1 ? text(err.message) : req.__("An error occurred")
-      );
-  } else
-    res
-      .status(code)
-      .sendWrap(
-        req.__(headline),
-        devmode ? pre(text(err.stack)) : h3(req.__(headline)),
-        role === 1 && !devmode ? pre(text(err.message)) : "",
-        createCrash
-          ? p(
-              req.__(
-                `A report has been logged and a team of bug-squashing squirrels has been dispatched to deal with the situation.`
+    if (req.xhr) {
+      res
+        .status(code)
+        .send(
+          devmode || role === 1
+            ? text(err.message)
+            : req.__("An error occurred")
+        );
+    } else
+      res
+        .status(code)
+        .sendWrap(
+          req.__(headline),
+          devmode ? pre(text(err.stack)) : h3(req.__(headline)),
+          role === 1 && !devmode ? pre(text(err.message)) : "",
+          createCrash
+            ? p(
+                req.__(
+                  `A report has been logged and a team of bug-squashing squirrels has been dispatched to deal with the situation.`
+                )
               )
-            )
-          : ""
-      );
-};
+            : ""
+        );
+  };

package/locales/en.json

@@ -919,5 +919,16 @@
 	"Build Result": "Build Result",
 	"Download automated backup": "Download automated backup",
 	"Restoring automated backup": "Restoring automated backup",
-	"No errors detected during configuration check": "No errors detected during configuration check"
+	"No errors detected during configuration check": "No errors detected during configuration check",
+	"%s view - %s on %s": "%s view - %s on %s",
+	"Please select at least one platform (android or iOS).": "Please select at least one platform (android or iOS).",
+	"Back": "Back",
+	"Periodic snapshots enabled": "Periodic snapshots enabled",
+	"Snapshot will be made every hour if there are changes": "Snapshot will be made every hour if there are changes",
+	"Snapshots": "Snapshots",
+	"Snapshot settings updated": "Snapshot settings updated",
+	"Download snapshots": "Download snapshots",
+	"Snapshot successful": "Snapshot successful",
+	"System logging verbosity": "System logging verbosity",
+	"Destination URL Formula": "Destination URL Formula"
 }