@ladjs/web 14.0.8 → 16.0.0

package/index.js

@@ -342,17 +342,54 @@ class Web {
     const stateHelper = new StateHelper(this.config.views.locals);
     app.use(stateHelper.middleware);
 
+    // add specific locals
+    app.use((ctx, next) => {
+      // passport-related helpers (e.g. for rendering log in with X buttons)
+      ctx.state.passport = ctx.passport ? {} : false;
+      if (
+        ctx.passport &&
+        ctx.passport.config &&
+        ctx.passport.config.providers
+      ) {
+        for (const key of Object.keys(ctx.passport.config.providers)) {
+          ctx.state.passport[key] = boolean(ctx.passport.config.providers[key]);
+        }
+      }
+
+      // add limited `ctx` object to the state for views
+      ctx.state.ctx = {};
+      ctx.state.ctx.get = ctx.get;
+      ctx.state.ctx.locale = ctx.locale;
+      ctx.state.ctx.params = ctx.params;
+      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;
+
+      return next();
+    });
+
     // session store
     app.keys = this.config.sessionKeys;
-    app.use(
-      session({
-        store: redisStore({ client: this.client }),
-        key: this.config.cookiesKey,
-        cookie: this.config.cookies,
-        genSid: this.config.genSid,
-        ...this.config.session
-      })
-    );
+    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();
+    });
 
     // redirect loop (must come after sessions added)
     if (this.config.redirectLoop) {
@@ -400,11 +437,12 @@ class Web {
         try {
           await csrf(ctx, next);
         } catch (err) {
+          ctx.logger.error(err);
           let error = err;
-          if (err.name && err.name === 'ForbiddenError') {
+          // this would indicate that redis is down
+          if (!ctx.session) error = Boom.clientTimeout();
+          else if (err.name && err.name === 'ForbiddenError')
             error = Boom.forbidden(err.message);
-            if (err.stack) error.stack = err.stack;
-          }
 
           ctx.throw(error);
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ladjs/web",
   "description": "Web server for Lad",
-  "version": "14.0.8",
+  "version": "16.0.0",
   "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": "^1.0.0",
+    "@ladjs/state-helper": "^2.0.0",
     "@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": "^3.0.8",
+    "koa-csrf": "^4.0.0",
     "koa-etag": "^4.0.0",
     "koa-favicon": "^2.1.0",
     "koa-generic-session": "^2.3.0",
@@ -74,7 +74,7 @@
     "pug": "^3.0.2",
     "remark-cli": "^11.0.0",
     "remark-preset-github": "^4.0.4",
-    "supertest": "^6.2.3",
+    "supertest": "^6.2.4",
     "xo": "^0.50.0"
   },
   "engines": {