@saltcorn/server 0.8.7 → 0.8.8-beta.1

package/auth/admin.js

@@ -55,9 +55,9 @@ module.exports = router;
  */
 const getUserFields = async (req) => {
   const userTable = Table.findOne({ name: "users" });
-  const userFields = (userTable.getFields()).filter(
-    (f) => !f.calculated && f.name !== "id"
-  );
+  const userFields = userTable
+    .getFields()
+    .filter((f) => !f.calculated && f.name !== "id");
   //console.log("userFields:",userFields);
   const iterForm = async (cfgField) => {
     const signup_form_name = getState().getConfig(cfgField, "");
@@ -242,6 +242,22 @@ router.get(
   "/",
   isAdmin,
   error_catcher(async (req, res) => {
+    const auth_methods = getState().auth_methods;
+    const userBadges = (user) =>
+      span(
+        !!user.disabled &&
+          span({ class: "badge bg-danger me-1" }, req.__("Disabled")),
+        !!user.verified_on &&
+          span({ class: "badge bg-success me-1" }, req.__("Verified")),
+        Object.entries(auth_methods)
+          .filter(
+            ([k, v]) =>
+              v.setsUserAttribute && user._attributes[v.setsUserAttribute]
+          )
+          .map(([k, v]) =>
+            span({ class: "badge bg-secondary me-1" }, v.label || k)
+          )
+      );
     const users = await User.find({}, { orderBy: "id" });
     const roles = await User.get_roles();
     let roleMap = {};
@@ -278,19 +294,7 @@ router.get(
               },
               {
                 label: "",
-                key: (r) =>
-                  r.disabled
-                    ? span({ class: "badge bg-danger" }, req.__("Disabled"))
-                    : "",
-              },
-              {
-                label: req.__("Verified"),
-                key: (r) =>
-                  r.verified_on
-                    ? i({
-                        class: "fas fa-check-circle text-success",
-                      })
-                    : "",
+                key: userBadges,
               },
               { label: req.__("Role"), key: (r) => roleMap[r.role_id] },
               {

package/auth/routes.js

@@ -224,7 +224,7 @@ const getAuthLinks = (current, noMethods) => {
  * @param {*} saltcornApp
  * @param {*} res
  */
-const loginWithJwt = async (email, password, saltcornApp, res) => {
+const loginWithJwt = async (email, password, saltcornApp, res, req) => {
   const loginFn = async () => {
     const publicUserLink = getState().getConfig("public_user_link");
     const jwt_secret = db.connectObj.jwt_secret;
@@ -254,7 +254,7 @@ const loginWithJwt = async (email, password, saltcornApp, res) => {
         res.json(token);
       } else {
         res.json({
-          alerts: [{ type: "danger", msg: "Incorrect user or password" }],
+          alerts: [{ type: "danger", msg: req.__("Incorrect user or password") }],
         });
       }
     } else if (publicUserLink) {
@@ -276,7 +276,7 @@ const loginWithJwt = async (email, password, saltcornApp, res) => {
       res.json(token);
     } else {
       res.json({
-        alerts: [{ type: "danger", msg: "The public login is deactivated" }],
+        alerts: [{ type: "danger", msg: req.__("The public login is deactivated") }],
       });
     }
   };
@@ -445,7 +445,7 @@ router.post(
         req.flash("success", req.__("Email with password reset link sent"));
         res.redirect("/auth/login");
       };
-      if (!u) {
+      if (!u || !u.password) {
         respond();
         return;
       }
@@ -986,7 +986,8 @@ router.post(
             email,
             password,
             req.headers["x-saltcorn-app"],
-            res
+            res,
+            req
           );
         else signup_login_with_user(u, req, res);
       }
@@ -1099,7 +1100,7 @@ router.get(
     const { method } = req.params;
     if (method === "jwt") {
       const { email, password } = req.query;
-      await loginWithJwt(email, password, req.headers["x-saltcorn-app"], res);
+      await loginWithJwt(email, password, req.headers["x-saltcorn-app"], res, req);
     } else {
       const auth = getState().auth_methods[method];
       if (auth) {
@@ -1339,12 +1340,16 @@ const userSettings = async ({ req, res, pwform, user }) => {
           )
         ),
       },
-      {
-        type: "card",
-        title: req.__("Change password"),
-        contents: renderForm(pwform, req.csrfToken()),
-      },
-      ...(show2FAPolicy
+      ...(user.password
+        ? [
+            {
+              type: "card",
+              title: req.__("Change password"),
+              contents: renderForm(pwform, req.csrfToken()),
+            },
+          ]
+        : []),
+      ...(user.password && show2FAPolicy
         ? [
             {
               type: "card",
@@ -1560,7 +1565,7 @@ router.post(
   loggedIn,
   error_catcher(async (req, res) => {
     const user = await User.findOne({ id: req.user.id });
-    if (req.body.new_password) {
+    if (req.body.new_password && user.password) {
       const pwform = changPwForm(req);
 
       pwform.fields[0].validator = (oldpw) => {

package/locales/en.json

@@ -1168,6 +1168,22 @@
 	"Tag Entries": "Tag Entries",
 	"Not a valid field name": "Not a valid field name",
 	"Set a default value for missing data": "Set a default value for missing data",
+	"Create model": "Create model",
+	"Models": "Models",
+	"New model": "New model",
+	"Show model": "Show model",
+	"Model instances": "Model instances",
+	"Trained": "Trained",
+	"Train new instance": "Train new instance",
+	"Train model": "Train model",
+	"Train": "Train",
+	"Report": "Report",
+	"Model training report": "Model training report",
+	"Model training error": "Model training error",
+	"Training error": "Training error",
+	"Model": "Model",
+	"Model instance": "Model instance",
+	"Prediction output": "Prediction output",
 	"Table triggers: ": "Table triggers: ",
 	"App name": "App name",
 	"App icon": "App icon",
@@ -1193,5 +1209,33 @@
 	"Prevent any deletion of parent rows": "Prevent any deletion of parent rows",
 	"If the parent row is deleted, set key fields on child rows to null": "If the parent row is deleted, set key fields on child rows to null",
 	"Link out?": "Link out?",
-	"Show a link to open popup contents in new tab": "Show a link to open popup contents in new tab"
+	"Show a link to open popup contents in new tab": "Show a link to open popup contents in new tab",
+	"Model %s deleted": "Model %s deleted",
+	"Model instance %s deleted": "Model instance %s deleted",
+	"Action information saved": "Action information saved",
+	"JavaScript code:": "JavaScript code:",
+	"code here": "code here",
+	"Page '%s' was loaded": "Page '%s' was loaded",
+	"View '%s' was loaded": "View '%s' was loaded",
+	"Error message": "Error message",
+	"Error shown to user if uniqueness is violated": "Error shown to user if uniqueness is violated",
+	"Protected": "Protected",
+	"Set role to access": "Set role to access",
+	"User must have this role or higher to update or create field values": "User must have this role or higher to update or create field values",
+	"Disable on mobile": "Disable on mobile",
+	"moment.js format specifier": "moment.js format specifier",
+	"Primary button": "Primary button",
+	"Secondary button": "Secondary button",
+	"Success button": "Success button",
+	"Danger button": "Danger button",
+	"Primary outline button": "Primary outline button",
+	"Secondary outline button": "Secondary outline button",
+	"Standard": "Standard",
+	"X-Small": "X-Small",
+	"Block": "Block",
+	"Large block": "Large block",
+	"Formula for JavaScript object that will be added to state parameters": "Formula for JavaScript object that will be added to state parameters",
+	"Alignment": "Alignment",
+	"Click to edit?": "Click to edit?",
+	"Format": "Format"
 }