@saltcorn/server 0.7.3-beta.3 → 0.7.3

package/app.js

@@ -227,7 +227,11 @@ const getApp = async (opts = {}) => {
   passport.use(
     new JwtStrategy(jwtOpts, (jwt_payload, done) => {
       User.findOne({ email: jwt_payload.sub }).then((u) => {
-        if (u) {
+        if (
+          u &&
+          u.last_mobile_login &&
+          u.last_mobile_login <= jwt_payload.iat
+        ) {
           return done(null, {
             email: u.email,
             id: u.id,

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

package/auth/routes.js

@@ -203,6 +203,7 @@ const loginWithJwt = async (req, res) => {
   const { email, password } = req.query;
   const user = await User.findOne({ email });
   if (user && user.checkPassword(password)) {
+    const now = new Date();
     const jwt_secret = db.connectObj.jwt_secret;
     const token = jwt.sign(
       {
@@ -210,9 +211,11 @@ const loginWithJwt = async (req, res) => {
         role_id: user.role_id,
         iss: "saltcorn@saltcorn",
         aud: "saltcorn-mobile-app",
+        iat: now.valueOf(),
       },
       jwt_secret
     );
+    if (!user.last_mobile_login) await user.updateLastMobileLogin(now);
     res.json(token);
   }
 };
@@ -249,18 +252,24 @@ router.get(
  * @function
  * @memberof module:auth/routes~routesRouter
  */
-router.get("/logout", (req, res, next) => {
-  req.logout();
-  if (req.session.destroy)
-    req.session.destroy((err) => {
-      if (err) return next(err);
+router.get("/logout", async (req, res, next) => {
+  if (req.smr && req.user?.id) {
+    const user = await User.findOne({ id: req.user.id });
+    await user.updateLastMobileLogin(null);
+    res.json({ success: true });
+  } else if (req.logout) {
+    req.logout();
+    if (req.session.destroy)
+      req.session.destroy((err) => {
+        if (err) return next(err);
+        req.logout();
+        res.redirect("/auth/login");
+      });
+    else {
       req.logout();
+      req.session = null;
       res.redirect("/auth/login");
-    });
-  else {
-    req.logout();
-    req.session = null;
-    res.redirect("/auth/login");
+    }
   }
 });
 
@@ -978,6 +987,11 @@ router.post(
       }
     Trigger.emitEvent("Login", null, req.user);
     req.flash("success", req.__("Welcome, %s!", req.user.email));
+    if (req.smr) {
+      const dbUser = await User.findOne({ id: req.user.id });
+      if (!dbUser.last_mobile_login)
+        await dbUser.updateLastMobileLogin(new Date());
+    }
     if (getState().get2FApolicy(req.user) === "Mandatory") {
       res.redirect("/auth/twofa/setup/totp");
     } else res.redirect("/");
@@ -1010,6 +1024,17 @@ router.get(
   })
 );
 
+/*
+  returns if 'req.user' is an authenticated user
+ */
+router.get(
+  "/authenticated",
+  error_catcher((req, res, next) => {
+    const isAuth = req.user && req.user.id ? true : false;
+    res.json({ authenticated: isAuth });
+  })
+);
+
 /**
  * @name post/login-with/:method
  * @function
@@ -1195,6 +1220,7 @@ const userSettings = async ({ req, res, pwform, user }) => {
         ? [
             {
               type: "card",
+              class: "mt-0",
               title: userSetsName,
               contents: usersets,
             },
@@ -1203,6 +1229,7 @@ const userSettings = async ({ req, res, pwform, user }) => {
       {
         type: "card",
         title: req.__("User"),
+        class: !usersets && "mt-0",
         contents: table(
           tbody(
             tr(

package/locales/en.json

@@ -916,5 +916,10 @@
 	"Delete old backup files in this directory after the set number of days": "Delete old backup files in this directory after the set number of days",
 	"Mobile app": "Mobile app",
 	"Build mobile app": "Build mobile app",
-	"Build Result": "Build Result"
+	"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",
+	"%s view - %s on %s": "%s view - %s on %s",
+	"Back": "Back"
 }