@ladjs/web 18.0.1 → 18.0.2

package/index.js

@@ -329,33 +329,6 @@ 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(
@@ -417,6 +390,33 @@ 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(

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ladjs/web",
   "description": "Web server for Lad",
-  "version": "18.0.1",
+  "version": "18.0.2",
   "author": "Nick Baugh <niftylettuce@gmail.com> (http://niftylettuce.com/)",
   "bugs": {
     "url": "https://github.com/ladjs/web/issues",