@saltcorn/server 0.7.4 → 0.8.0-beta.1

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;
     });

package/auth/routes.js

@@ -201,32 +201,57 @@ const getAuthLinks = (current, noMethods) => {
 
 const loginWithJwt = async (email, password, saltcornApp, res) => {
   const loginFn = async () => {
-    const user = await User.findOne({ email });
-    if (user && user.checkPassword(password)) {
-      const now = new Date();
-      const jwt_secret = db.connectObj.jwt_secret;
+    const publicUserLink = getState().getConfig("public_user_link");
+    const jwt_secret = db.connectObj.jwt_secret;
+    if (email && password) {
+      // with credentials
+      const user = await User.findOne({ email });
+      if (user && user.checkPassword(password)) {
+        const now = new Date();
+        const token = jwt.sign(
+          {
+            sub: email,
+            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.valueOf(),
+            tenant: db.getTenantSchema(),
+          },
+          jwt_secret
+        );
+        if (!user.last_mobile_login) await user.updateLastMobileLogin(now);
+        res.json(token);
+      } else {
+        res.json({
+          alerts: [{ type: "danger", msg: "Incorrect user or password" }],
+        });
+      }
+    } else if (publicUserLink) {
+      // public login
       const token = jwt.sign(
         {
-          sub: email,
+          sub: "public",
           user: {
-            id: user.id,
-            email: user.email,
-            role_id: user.role_id,
-            language: user.language ? user.language : "en",
-            disabled: user.disabled,
+            role_id: 10,
+            language: "en",
           },
           iss: "saltcorn@saltcorn",
           aud: "saltcorn-mobile-app",
-          iat: now.valueOf(),
+          iat: new Date().valueOf(),
           tenant: db.getTenantSchema(),
         },
         jwt_secret
       );
-      if (!user.last_mobile_login) await user.updateLastMobileLogin(now);
       res.json(token);
     } else {
       res.json({
-        alerts: [{ type: "danger", msg: "Incorrect user or password" }],
+        alerts: [{ type: "danger", msg: "The public login is deactivated" }],
       });
     }
   };
@@ -1158,7 +1183,7 @@ const setLanguageForm = (req, user) =>
         option(
           {
             value: locale,
-            ...(user && user.language === locale && { selected: true }),
+            ...(((user && user.language === locale) || (user && !user.language && req.getLocale() === locale)) && { selected: true }),
           },
           language
         )
@@ -1382,7 +1407,7 @@ router.get(
       return;
     }
     res.sendWrap(
-      req.__("User settings"),
+      req.__("User settings") || "User settings",
       await userSettings({ req, res, pwform: changPwForm(req), user })
     );
   })