@ladjs/web 16.0.1 → 16.0.4

package/index.js

@@ -364,7 +364,6 @@ class Web {
       ctx.state.ctx.path = ctx.path;
       ctx.state.ctx.pathWithoutLocale = ctx.pathWithoutLocale;
       ctx.state.ctx.query = ctx.query;
-      ctx.state.ctx.session = ctx.session;
       ctx.state.ctx.sessionId = ctx.sessionId;
       ctx.state.ctx.translate = ctx.translate;
       ctx.state.ctx.url = ctx.url;
@@ -374,22 +373,15 @@ class Web {
 
     // session store
     app.keys = this.config.sessionKeys;
-    app.use(async (ctx, next) => {
-      try {
-        await session({
-          store: redisStore({ client: this.client }),
-          key: this.config.cookiesKey,
-          cookie: this.config.cookies,
-          genSid: this.config.genSid,
-          ...this.config.session
-        })(ctx, () => Promise.resolve());
-      } catch (err) {
-        // this would indicate that redis is down
-        ctx.logger.error(err);
-      }
-
-      return next();
-    });
+    app.use(
+      session({
+        store: redisStore({ client: this.client }),
+        key: this.config.cookiesKey,
+        cookie: this.config.cookies,
+        genSid: this.config.genSid,
+        ...this.config.session
+      })
+    );
 
     // redirect loop (must come after sessions added)
     if (this.config.redirectLoop) {
@@ -436,12 +428,11 @@ class Web {
 
         try {
           await csrf(ctx, next);
+          ctx.state.csrf = ctx.csrf;
         } catch (err) {
           ctx.logger.error(err);
           let error = err;
-          // this would indicate that redis is down
-          if (!ctx.session) error = Boom.clientTimeout();
-          else if (err.name && err.name === 'ForbiddenError')
+          if (err.name && err.name === 'ForbiddenError')
             error = Boom.forbidden(err.message);
 
           ctx.throw(error);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ladjs/web",
   "description": "Web server for Lad",
-  "version": "16.0.1",
+  "version": "16.0.4",
   "author": "Nick Baugh <niftylettuce@gmail.com> (http://niftylettuce.com/)",
   "bugs": {
     "url": "https://github.com/ladjs/web/issues",
@@ -20,7 +20,7 @@
     "@ladjs/koa-simple-ratelimit": "^3.0.0",
     "@ladjs/redis": "^1.0.7",
     "@ladjs/shared-config": "^7.0.3",
-    "@ladjs/state-helper": "^2.0.0",
+    "@ladjs/state-helper": "^2.0.2",
     "@ladjs/store-ip-address": "^0.0.7",
     "boolean": "^3.2.0",
     "cabin": "^9.1.2",
@@ -39,7 +39,7 @@
     "koa-compress": "^5.1.0",
     "koa-conditional-get": "^3.0.0",
     "koa-connect": "^2.1.0",
-    "koa-csrf": "^4.0.0",
+    "koa-csrf": "^4.0.1",
     "koa-etag": "^4.0.0",
     "koa-favicon": "^2.1.0",
     "koa-generic-session": "^2.3.0",
@@ -63,7 +63,7 @@
     "@ladjs/passport": "^5.0.2",
     "ava": "^4.3.0",
     "cross-env": "^7.0.3",
-    "eslint": "^8.18.0",
+    "eslint": "^8.19.0",
     "eslint-config-xo-lass": "^2.0.1",
     "fixpack": "^4.0.0",
     "husky": "^8.0.1",