@ladjs/web 17.0.10 → 18.0.2

package/index.js

@@ -254,16 +254,6 @@ class Web {
     // basic auth
     if (this.config.auth) app.use(auth(this.config.auth));
 
-    // rate limiting
-    if (this.config.rateLimit)
-      app.use(
-        ratelimit({
-          ...this.config.rateLimit,
-          db: this.client,
-          logger: this.logger
-        })
-      );
-
     // remove trailing slashes
     app.use(removeTrailingSlashes());
 
@@ -339,39 +329,16 @@ 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.bind(ctx);
-      ctx.state.ctx.locale = ctx.locale;
-      ctx.state.ctx.path = ctx.path;
-      ctx.state.ctx.pathWithoutLocale = ctx.pathWithoutLocale;
-      ctx.state.ctx.query = ctx.query;
-      ctx.state.ctx.sessionId = ctx.sessionId;
-      ctx.state.ctx.url = ctx.url;
-
-      return next();
-    });
-
     // session store
     app.keys = this.config.sessionKeys;
     app.use(
       session({
         ...this.config.session,
-        store: redisStore({ client: this.client }),
+        ...(this.client
+          ? {
+              store: redisStore({ client: this.client })
+            }
+          : {}),
         key: this.config.cookiesKey,
         cookie: this.config.cookies,
         genSid: this.config.genSid
@@ -423,6 +390,43 @@ class Web {
       app.use(this.passport.session());
     }
 
+    // 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.bind(ctx);
+      ctx.state.ctx.locale = ctx.locale;
+      ctx.state.ctx.path = ctx.path;
+      ctx.state.ctx.pathWithoutLocale = ctx.pathWithoutLocale;
+      ctx.state.ctx.query = ctx.query;
+      ctx.state.ctx.sessionId = ctx.sessionId;
+      ctx.state.ctx.url = ctx.url;
+
+      return next();
+    });
+
+    // rate limiting
+    if (this.client && this.config.rateLimit)
+      app.use(
+        ratelimit({
+          ...this.config.rateLimit,
+          db: this.client,
+          logger: this.logger
+        })
+      );
+
     // store the user's last ip address in the background
     if (this.config.storeIPAddress) {
       const storeIPAddress = new StoreIPAddress({

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ladjs/web",
   "description": "Web server for Lad",
-  "version": "17.0.10",
+  "version": "18.0.2",
   "author": "Nick Baugh <niftylettuce@gmail.com> (http://niftylettuce.com/)",
   "bugs": {
     "url": "https://github.com/ladjs/web/issues",
@@ -12,7 +12,7 @@
   ],
   "dependencies": {
     "@hapi/boom": "^10.0.0",
-    "@koa/router": "^11.0.0",
+    "@koa/router": "^11.0.1",
     "@ladjs/i18n": "^8.0.1",
     "@ladjs/koa-better-static": "^2.0.1",
     "@ladjs/koa-cache-responses": "^0.0.3",
@@ -31,7 +31,7 @@
     "koa": "^2.13.4",
     "koa-404-handler": "^0.1.0",
     "koa-basic-auth": "^4.0.0",
-    "koa-better-error-handler": "^10.0.6",
+    "koa-better-error-handler": "^10.0.7",
     "koa-better-flash": "^0.0.4",
     "koa-better-timeout": "^0.0.6",
     "koa-bodyparser": "^4.3.0",