@saltcorn/server 0.9.3-beta.2 → 0.9.3-beta.4

package/auth/routes.js

@@ -56,7 +56,7 @@ const Table = require("@saltcorn/data/models/table");
 const {
   getForm,
 } = require("@saltcorn/data/base-plugin/viewtemplates/viewable_fields");
-const { InvalidConfiguration } = require("@saltcorn/data/utils");
+const { InvalidConfiguration, getSessionId } = require("@saltcorn/data/utils");
 const Trigger = require("@saltcorn/data/models/trigger");
 const { restore_backup } = require("../markup/admin.js");
 const { restore } = require("@saltcorn/admin-models/models/backup");
@@ -710,10 +710,12 @@ const getNewUserForm = async (new_user_view_name, req, askEmail) => {
  * @param {object} res
  * @returns {void}
  */
-const signup_login_with_user = (u, req, res, redirUrl) =>
-  req.login(u.session_object, function (err) {
+const signup_login_with_user = (u, req, res, redirUrl) => {
+  const old_session_id = getSessionId(req);
+  return req.login(u.session_object, function (err) {
     if (!err) {
-      Trigger.emitEvent("Login", null, u);
+      const session_id = getSessionId(req);
+      Trigger.emitEvent("Login", null, u, { old_session_id, session_id });
       if (getState().verifier) res.redirect("/auth/verification-flow");
       else if (getState().get2FApolicy(u) === "Mandatory")
         res.redirect("/auth/twofa/setup/totp");
@@ -723,7 +725,7 @@ const signup_login_with_user = (u, req, res, redirUrl) =>
       res.redirect("/auth/signup");
     }
   });
-
+};
 /**
  * @name get/signup_final_ext
  * @function
@@ -1063,6 +1065,11 @@ const userLimiter = rateLimit({
   handler,
 });
 
+function setOldSessionID(req, res, next) {
+  req.old_session_id = getSessionId(req);
+  next();
+}
+
 /**
  * POST /auth/login
  * @name post/login
@@ -1073,6 +1080,7 @@ router.post(
   "/login",
   ipLimiter,
   userLimiter,
+  setOldSessionID,
   passport.authenticate("local", {
     //successRedirect: "/",
     failureRedirect: "/auth/login",
@@ -1095,7 +1103,12 @@ router.post(
         if (setDur) req.session.cookie.maxAge = setDur * 60 * 60 * 1000;
         else req.session.cookie.expires = false;
       }
-    Trigger.emitEvent("Login", null, req.user);
+    const session_id = getSessionId(req);
+
+    Trigger.emitEvent("Login", null, req.user, {
+      session_id,
+      old_session_id: req.old_session_id,
+    });
     res?.cookie?.("loggedin", "true");
     req.flash("success", req.__("Welcome, %s!", req.user.email));
     if (req.smr) {

package/locales/en.json

@@ -1287,5 +1287,12 @@
 	"Configure action": "Configure action",
 	"No changes detected, snapshot skipped": "No changes detected, snapshot skipped",
 	"Cannot remove module: views %s depend on it": "Cannot remove module: views %s depend on it",
-	"The view name is part of the URL when it is shown alone.": "The view name is part of the URL when it is shown alone."
+	"The view name is part of the URL when it is shown alone.": "The view name is part of the URL when it is shown alone.",
+	"Exclusion relations": "Exclusion relations",
+	"Do not include row if this relation has a match": "Do not include row if this relation has a match",
+	"Exclusion where": "Exclusion where",
+	"Hoverable rows": "Hoverable rows",
+	"Highlight row under cursor": "Highlight row under cursor",
+	"Striped rows": "Striped rows",
+	"Add zebra stripes to rows": "Add zebra stripes to rows"
 }

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.9.3-beta.2",
+  "version": "0.9.3-beta.4",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
     "@aws-sdk/client-s3": "^3.451.0",
-    "@saltcorn/base-plugin": "0.9.3-beta.2",
-    "@saltcorn/builder": "0.9.3-beta.2",
-    "@saltcorn/data": "0.9.3-beta.2",
-    "@saltcorn/admin-models": "0.9.3-beta.2",
-    "@saltcorn/filemanager": "0.9.3-beta.2",
-    "@saltcorn/markup": "0.9.3-beta.2",
-    "@saltcorn/sbadmin2": "0.9.3-beta.2",
+    "@saltcorn/base-plugin": "0.9.3-beta.4",
+    "@saltcorn/builder": "0.9.3-beta.4",
+    "@saltcorn/data": "0.9.3-beta.4",
+    "@saltcorn/admin-models": "0.9.3-beta.4",
+    "@saltcorn/filemanager": "0.9.3-beta.4",
+    "@saltcorn/markup": "0.9.3-beta.4",
+    "@saltcorn/sbadmin2": "0.9.3-beta.4",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",
@@ -54,7 +54,7 @@
     "pg": "^8.2.1",
     "pluralize": "^8.0.0",
     "qrcode": "1.5.1",
-    "resize-with-sharp-or-jimp": "0.1.6",
+    "resize-with-sharp-or-jimp": "0.1.7",
     "socket.io": "4.6.0",
     "systeminformation": "^5.21.7",
     "thirty-two": "1.0.2",

package/public/saltcorn.js

@@ -513,7 +513,7 @@ function applyViewConfig(e, url, k, event) {
     complete: () => {},
   });
 
-  return false;
+  //return false;
 }
 
 function updateViewPreview() {