Merge pull request #350 from ahfarmer/master

docs: remove references to express's old app.configure() method
jaredhanson · Aug 20, 2015 · 0532f79 · 0532f79
2 parents bed6bb1 + dfcaaac
commit 0532f79
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 27 deletions.
diff --git a/README.md b/README.md
@@ -78,15 +78,14 @@ with the required `passport.initialize()` middleware.  If your application uses
 persistent login sessions (recommended, but not required), `passport.session()`
 middleware must also be used.
 
-    app.configure(function() {
-      app.use(express.static(__dirname + '/../../public'));
-      app.use(express.cookieParser());
-      app.use(express.bodyParser());
-      app.use(express.session({ secret: 'keyboard cat' }));
-      app.use(passport.initialize());
-      app.use(passport.session());
-      app.use(app.router);
-    });
+    var app = express();
+    app.use(express.static(__dirname + '/../../public'));
+    app.use(express.cookieParser());
+    app.use(express.bodyParser());
+    app.use(express.session({ secret: 'keyboard cat' }));
+    app.use(passport.initialize());
+    app.use(passport.session());
+    app.use(app.router);
 
 #### Authenticate Requests
 

diff --git a/lib/authenticator.js b/lib/authenticator.js
@@ -116,13 +116,9 @@ Authenticator.prototype.framework = function(fw) {
  *
  * Examples:
  *
- *     app.configure(function() {
- *       app.use(passport.initialize());
- *     });
+ *     app.use(passport.initialize());
  *
- *     app.configure(function() {
- *       app.use(passport.initialize({ userProperty: 'currentUser' }));
- *     });
+ *     app.use(passport.initialize({ userProperty: 'currentUser' }));
  *
  * @param {Object} options
  * @return {Function} middleware
@@ -215,12 +211,10 @@ Authenticator.prototype.authorize = function(strategy, options, callback) {
  *
  * Examples:
  *
- *     app.configure(function() {
- *       app.use(connect.cookieParser());
- *       app.use(connect.session({ secret: 'keyboard cat' }));
- *       app.use(passport.initialize());
- *       app.use(passport.session());
- *     });
+ *     app.use(connect.cookieParser());
+ *     app.use(connect.session({ secret: 'keyboard cat' }));
+ *     app.use(passport.initialize());
+ *     app.use(passport.session());
  *
  * Options:
  *   - `pauseStream`      Pause the request stream before deserializing the user

diff --git a/lib/middleware/initialize.js b/lib/middleware/initialize.js
@@ -21,12 +21,10 @@
  *
  * Examples:
  *
- *     app.configure(function() {
- *       app.use(connect.cookieParser());
- *       app.use(connect.session({ secret: 'keyboard cat' }));
- *       app.use(passport.initialize());
- *       app.use(passport.session());
- *     });
+ *     app.use(connect.cookieParser());
+ *     app.use(connect.session({ secret: 'keyboard cat' }));
+ *     app.use(passport.initialize());
+ *     app.use(passport.session());
  *
  *     passport.serializeUser(function(user, done) {
  *       done(null, user.id);