Bring fork up to date

Merge branch 'master' of https://github.com/danielsharvey/passport
into passport-doco-updates.

Author: Daniel Harvey

.gitignore

@@ -1,9 +1,9 @@
-build/
+docs/
 reports/
 
-# Node.js
-node_modules/
-npm-debug.log
-
 # Mac OS X
 .DS_Store
+
+# Node.js
+node_modules
+npm-debug.log

.npmignore

@@ -1,23 +1,8 @@
 Makefile
-README.md
-build/
 docs/
 examples/
 reports/
-support/
 test/
 
-# Node.js
-.npmignore
-node_modules/
-npm-debug.log
-
-# Mac OS X
-.DS_Store
-
-# Git
-.git*
-
-# Utilities
 .jshintrc
 .travis.yml

.travis.yml

@@ -1,14 +1,24 @@
 language: "node_js"
 node_js:
+  - "5"
+  - "4"
+  - "3" # io.js
+  - "2" # io.js
+  - "1" # io.js
   - "0.12"
   - "0.10"
-  - "iojs"
+  - "0.8"
+  - "0.6"
+
 
 before_install:
- - "npm install istanbul -g"
- - "npm install coveralls -g"
+  - "npm install [email protected] -g"
+  - "preinstall-compat"
 
-script: "make ci-travis"
+script:
+  - "make test-cov"
 
 after_success:
-  - "make submit-cov-to-coveralls"
+  - "make report-cov"
+
+sudo: false

Makefile

@@ -1,47 +1,25 @@
-SOURCES ?= lib/*.js lib/**/*.js
-TESTS ?= test/*.test.js test/**/*.test.js
+include node_modules/make-node/main.mk
 
-test: test-mocha
-test-cov: test-istanbul-mocha
-view-cov: view-istanbul-report
-lint: lint-jshint
-lint-tests: lint-tests-jshint
 
+SOURCES = lib/*.js lib/**/*.js
+TESTS = test/*.test.js test/**/*.test.js
 
-# ==============================================================================
-# Node.js
-# ==============================================================================
-include support/mk/node.mk
-include support/mk/mocha.mk
-include support/mk/istanbul.mk
+LCOVFILE = ./reports/coverage/lcov.info
 
-# ==============================================================================
-# Analysis
-# ==============================================================================
-include support/mk/notes.mk
-include support/mk/jshint.mk
+MOCHAFLAGS = --require ./test/bootstrap/node
 
-# ==============================================================================
-# Reports
-# ==============================================================================
-include support/mk/coveralls.mk
 
-# ==============================================================================
-# Continuous Integration
-# ==============================================================================
-submit-cov-to-coveralls: submit-istanbul-lcov-to-coveralls
+view-docs:
+	open ./docs/index.html
 
-# Travis CI
-ci-travis: test test-cov
+view-cov:
+	open ./reports/coverage/lcov-report/index.html
 
-# ==============================================================================
-# Clean
-# ==============================================================================
-clean:
-	rm -rf build
-	rm -rf reports
+clean: clean-docs clean-cov
+	-rm -r $(REPORTSDIR)
 
-clobber: clean clobber-node
+clobber: clean
+	-rm -r node_modules
 
 
-.PHONY: test test-cov view-cov lint lint-tests submit-cov-to-coveralls ci-travis clean clobber
+.PHONY: clean clobber

README.md

@@ -21,7 +21,9 @@ hooks for controlling what occurs when authentication succeeds or fails.
 
 ## Install
 
-    $ npm install passport
+```
+$ npm install passport
+```
 
 ## Usage
 
@@ -35,16 +37,18 @@ or [Twitter](http://twitter.com/)), or federated authentication using [OpenID](h
 Before authenticating requests, the strategy (or strategies) used by an
 application must be configured.
 
-    passport.use(new LocalStrategy(
-      function(username, password, done) {
-        User.findOne({ username: username }, function (err, user) {
-          if (err) { return done(err); }
-          if (!user) { return done(null, false); }
-          if (!user.verifyPassword(password)) { return done(null, false); }
-          return done(null, user);
-        });
-      }
-    ));
+```javascript
+passport.use(new LocalStrategy(
+  function(username, password, done) {
+    User.findOne({ username: username }, function (err, user) {
+      if (err) { return done(err); }
+      if (!user) { return done(null, false); }
+      if (!user.verifyPassword(password)) { return done(null, false); }
+      return done(null, user);
+    });
+  }
+));
+```
 
 There are 300+ strategies. Find the ones you want at: [passportjs.org](http://passportjs.org)
 
@@ -60,15 +64,17 @@ serialization and deserialization logic.  In a typical application, this will be
 as simple as serializing the user ID, and finding the user by ID when
 deserializing.
 
-    passport.serializeUser(function(user, done) {
-      done(null, user.id);
-    });
+```javascript
+passport.serializeUser(function(user, done) {
+  done(null, user.id);
+});
 
-    passport.deserializeUser(function(id, done) {
-      User.findById(id, function (err, user) {
-        done(err, user);
-      });
-    });
+passport.deserializeUser(function(id, done) {
+  User.findById(id, function (err, user) {
+    done(err, user);
+  });
+});
+```
 
 #### Middleware
 
@@ -78,24 +84,28 @@ with the required `passport.initialize()` middleware.  If your application uses
 persistent login sessions (recommended, but not required), `passport.session()`
 middleware must also be used.
 
-    var app = express();
-    app.use(require('serve-static')(__dirname + '/../../public'));
-    app.use(require('cookie-parser')());
-    app.use(require('body-parser').urlencoded({ extended: true }));
-    app.use(require('express-session')({ secret: 'keyboard cat', resave: true, saveUninitialized: true }));
-    app.use(passport.initialize());
-    app.use(passport.session());
+```javascript
+var app = express();
+app.use(require('serve-static')(__dirname + '/../../public'));
+app.use(require('cookie-parser')());
+app.use(require('body-parser').urlencoded({ extended: true }));
+app.use(require('express-session')({ secret: 'keyboard cat', resave: true, saveUninitialized: true }));
+app.use(passport.initialize());
+app.use(passport.session());
+```
 
 #### Authenticate Requests
 
 Passport provides an `authenticate()` function, which is used as route
 middleware to authenticate requests.
 
-    app.post('/login', 
-      passport.authenticate('local', { failureRedirect: '/login' }),
-      function(req, res) {
-        res.redirect('/');
-      });
+```javascript
+app.post('/login', 
+  passport.authenticate('local', { failureRedirect: '/login' }),
+  function(req, res) {
+    res.redirect('/');
+  });
+```
 
 ## Strategies
 
@@ -122,10 +132,12 @@ The following table lists commonly used strategies:
 
 - For a complete, working example, refer to the [example](https://github.com/passport/express-4.x-local-example)
 that uses [passport-local](https://github.com/jaredhanson/passport-local).
-- **Local Strategy**: Refer to the following tutorials for setting up user authentication via LocalStrategy (`passport-local`)
+- **Local Strategy**: Refer to the following tutorials for setting up user authentication via LocalStrategy (`passport-local`):
     - Express v3x - [Tutorial](http://mherman.org/blog/2013/11/11/user-authentication-with-passport-dot-js/) / [working example](https://github.com/mjhea0/passport-local)
     - Express v4x - [Tutorial](http://mherman.org/blog/2015/01/31/local-authentication-with-passport-and-express-4/) / [working example](https://github.com/mjhea0/passport-local-express4)
-- **Social Authentication**: Refer to this [tutorial](http://mherman.org/blog/2013/11/10/social-authentication-with-passport-dot-js/) for setting up various social authentication strategies, including a working example found on this [repo](https://github.com/mjhea0/passport-examples).
+- **Social Authentication**: Refer to the following tutorials for setting up various social authentication strategies:
+    - Express v3x - [Tutorial](http://mherman.org/blog/2013/11/10/social-authentication-with-passport-dot-js/) / [working example](https://github.com/mjhea0/passport-examples)
+    - Express v4x - [Tutorial](http://mherman.org/blog/2015/09/26/social-authentication-in-node-dot-js-with-passport) / [working example](https://github.com/mjhea0/passport-social-auth)
 
 ## Related Modules
 
@@ -140,8 +152,10 @@ that build upon or integrate with Passport.
 
 ## Tests
 
-    $ npm install
-    $ make test
+```
+$ npm install
+$ make test
+```
 
 ## Credits
 

lib/errors/authenticationerror.js

@@ -1,6 +1,7 @@
 /**
  * `AuthenticationError` error.
  *
+ * @constructor
  * @api private
  */
 function AuthenticationError(message, status) {
@@ -11,13 +12,9 @@ function AuthenticationError(message, status) {
   this.status = status || 401;
 }
 
-/**
- * Inherit from `Error`.
- */
+// Inherit from `Error`.
 AuthenticationError.prototype.__proto__ = Error.prototype;
 
 
-/**
- * Expose `AuthenticationError`.
- */
+// Expose constructor.
 module.exports = AuthenticationError;

lib/framework/connect.js

@@ -15,13 +15,25 @@ var initialize = require('../middleware/initialize')
  * @return {Object}
  * @api protected
  */
-module.exports = function() {
+exports = module.exports = function() {
 
   // HTTP extensions.
-  require('../http/request');
+  exports.__monkeypatchNode();
 
   return {
     initialize: initialize,
     authenticate: authenticate
   };
 };
+
+exports.__monkeypatchNode = function() {
+  var http = require('http');
+  var IncomingMessageExt = require('../http/request');
+  
+  http.IncomingMessage.prototype.login =
+  http.IncomingMessage.prototype.logIn = IncomingMessageExt.logIn;
+  http.IncomingMessage.prototype.logout =
+  http.IncomingMessage.prototype.logOut = IncomingMessageExt.logOut;
+  http.IncomingMessage.prototype.isAuthenticated = IncomingMessageExt.isAuthenticated;
+  http.IncomingMessage.prototype.isUnauthenticated = IncomingMessageExt.isUnauthenticated;
+};

lib/http/request.js

@@ -1,12 +1,14 @@
 /**
  * Module dependencies.
  */
-var http = require('http')
-  , req = http.IncomingMessage.prototype;
+//var http = require('http')
+//  , req = http.IncomingMessage.prototype;
 
 
+var req = exports = module.exports = {};
+
 /**
- * Intiate a login session for `user`.
+ * Initiate a login session for `user`.
  *
  * Options:
  *   - `session`  Save login state in session, defaults to _true_

lib/middleware/authenticate.js

@@ -2,6 +2,7 @@
  * Module dependencies.
  */
 var http = require('http')
+  , IncomingMessageExt = require('../http/request')
   , AuthenticationError = require('../errors/authenticationerror');
 
 
@@ -30,7 +31,7 @@ var http = require('http')
  *                        message for failures (overrides any from the strategy itself).
  *   - `assignProperty`   Assign the object provided by the verify callback to given property
  *
- * An optional `callback` can be supplied to allow the application to overrride
+ * An optional `callback` can be supplied to allow the application to override
  * the default manner in which authentication attempts are handled.  The
  * callback has the following signature, where `user` will be set to the
  * authenticated user on a successful authentication attempt, or `false`
@@ -91,6 +92,12 @@ module.exports = function authenticate(passport, name, options, callback) {
   }
 
   return function authenticate(req, res, next) {
+    if (http.IncomingMessage.prototype.logIn
+        && http.IncomingMessage.prototype.logIn !== IncomingMessageExt.logIn) {
+      require('../framework/connect').__monkeypatchNode();
+    }
+    
+    
     // accumulator for failures from each strategy in the chain
     var failures = [];
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "passport",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "Simple, unobtrusive authentication for Node.js.",
   "keywords": [
     "express",
@@ -26,7 +26,7 @@
   "licenses": [
     {
       "type": "MIT",
-      "url": "http://www.opensource.org/licenses/MIT"
+      "url": "http://opensource.org/licenses/MIT"
     }
   ],
   "main": "./lib",
@@ -35,6 +35,7 @@
     "pause": "0.0.1"
   },
   "devDependencies": {
+    "make-node": "0.3.x",
     "mocha": "2.x.x",
     "chai": "2.x.x",
     "chai-connect-middleware": "0.3.x",
@@ -47,4 +48,4 @@
   "scripts": {
     "test": "node_modules/.bin/mocha --reporter spec --require test/bootstrap/node test/*.test.js test/**/*.test.js"
   }
-}
+}