@saltcorn/server 1.3.0-beta.4 → 1.3.0-beta.6

package/app.js

@@ -236,14 +236,14 @@ const getApp = async (opts = {}) => {
   //legacy
   app.use(
     express.static(__dirname + "/public", {
-      maxAge: development_mode ? 0 : 1000 * 60 * 15,
+      maxAge: 1000 * 60 * 60 * 24,
     })
   );
   app.use(
     express.static(
       path.dirname(require.resolve("@saltcorn/builder/package.json")) + "/dist",
       {
-        maxAge: development_mode ? 0 : 1000 * 60 * 30,
+        maxAge: 1000 * 60 * 60 * 24,
       }
     )
   );
@@ -251,7 +251,7 @@ const getApp = async (opts = {}) => {
   if (process.env.SALTCORN_SERVE_ADDITIONAL_DIR)
     app.use(
       express.static(process.env.SALTCORN_SERVE_ADDITIONAL_DIR, {
-        maxAge: development_mode ? 0 : 1000 * 60 * 15,
+        maxAge: 1000 * 60 * 60 * 24,
       })
     );
   let version_tag = db.connectObj.version_tag;
@@ -260,7 +260,7 @@ const getApp = async (opts = {}) => {
     app.use(
       "/mobile_test_build",
       express.static(process.env.SALTCORN_SERVE_MOBILE_TEST_BUILD, {
-        maxAge: development_mode ? 0 : "100d",
+        maxAge: "100d",
       })
     );
   }
@@ -268,7 +268,7 @@ const getApp = async (opts = {}) => {
   app.use(
     `/static_assets/${version_tag}`,
     express.static(__dirname + "/public", {
-      maxAge: development_mode ? 0 : "100d",
+      maxAge: "100d",
     })
   );
   app.use(
@@ -276,7 +276,7 @@ const getApp = async (opts = {}) => {
     express.static(
       path.dirname(require.resolve("@saltcorn/builder/package.json")) + "/dist",
       {
-        maxAge: development_mode ? 0 : "100d",
+        maxAge: "100d",
       }
     )
   );
@@ -286,7 +286,7 @@ const getApp = async (opts = {}) => {
       path.dirname(require.resolve("@saltcorn/filemanager/package.json")) +
         "/public/build",
       {
-        maxAge: development_mode ? 0 : "100d",
+        maxAge: "100d",
       }
     )
   );
@@ -447,7 +447,7 @@ const getApp = async (opts = {}) => {
   mountRoutes(app);
   // set tenant homepage as / root
   app.get("/", error_catcher(homepage));
-  
+
   app.use((req, res, next) => {
     const tenant = db.getTenantSchema();
     if (!pluginRoutesHandler.tenantRouters[tenant]) {

package/auth/routes.js

@@ -1192,10 +1192,27 @@ router.post(
       }
     const session_id = getSessionId(req);
 
-    Trigger.emitEvent("Login", null, req.user, {
-      session_id,
-      old_session_id: req.old_session_id,
-    });
+    const resultCollector = {};
+    await Trigger.runTableTriggers(
+      "Login",
+      null,
+      req.user,
+      resultCollector,
+      req.user
+    );
+    if (resultCollector.notify) {
+      req.flash("warning", resultCollector.notify);
+    }
+    if (resultCollector.error) {
+      req.flash("error", resultCollector.error);
+    }
+    if(resultCollector.notify_success) {
+      req.flash("success", resultCollector.notify_success);
+    }
+    if (resultCollector.goto) {
+      res.redirect(resultCollector.goto);
+      return;
+    }
     res?.cookie?.("loggedin", "true", maxAge ? { maxAge } : undefined);
     req.flash("success", req.__("Welcome, %s!", req.user.email));
     if (req.smr) {