Move hard-to-track-down req.secret deprecation message

expressjs · Jun 22, 2014 · 7dd75d0 · 7dd75d0
1 parent 32d99d0
commit 7dd75d0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/History.md b/History.md
@@ -1,3 +1,8 @@
+unreleased
+==========
+
+  * Move hard-to-track-down `req.secret` deprecation message
+
 1.5.0 / 2014-06-19
 ==================
 

diff --git a/index.js b/index.js
@@ -112,6 +112,10 @@ function session(options){
   store.on('disconnect', function(){ storeReady = false; });
   store.on('connect', function(){ storeReady = true; });
 
+  if (!options.secret) {
+    deprecate('pass secret option; do not use req.secret');
+  }
+
   return function session(req, res, next) {
     // self-awareness
     if (req.session) return next();
@@ -128,10 +132,6 @@ function session(options){
     // req.secret is passed from the cookie parser middleware
     var secret = options.secret || req.secret;
 
-    if (!options.secret && req.secret) {
-      deprecate('pass secret option; do not use req.secret');
-    }
-
     // ensure secret is available or bail
     if (!secret) throw new Error('`secret` option required for sessions');