From f8aabfddbcbd32649cb82c05e8a5bc7782b73039 Mon Sep 17 00:00:00 2001 From: Iyanu-Tomiwa Date: Tue, 18 Sep 2018 18:08:30 +0100 Subject: [PATCH] Removed monkeypatching http --- lib/framework/connect.js | 17 ----------------- lib/http/request.js | 7 ++++++- test/http/request.test.js | 2 +- 3 files changed, 7 insertions(+), 19 deletions(-) diff --git a/lib/framework/connect.js b/lib/framework/connect.js index 77f587cf..b923c34e 100644 --- a/lib/framework/connect.js +++ b/lib/framework/connect.js @@ -3,11 +3,8 @@ */ /* eslint-disable camelcase, no-proto, no-shadow */ -const http = require('http'); const initialize = require('../middleware/initialize'); const authenticate = require('../middleware/authenticate'); -const IncomingMessageExt = require('../http/request'); - /** * Framework support for Connect/Express. * @@ -22,22 +19,8 @@ const IncomingMessageExt = require('../http/request'); // eslint-disable-next-line no-multi-assign, func-names exports = module.exports = function () { - // HTTP extensions. - exports.__monkeypatchNode(); - return { initialize, authenticate, }; }; - -exports.__monkeypatchNode = function __monkeypatchNode() { - http.IncomingMessage.prototype.logIn = IncomingMessageExt.logIn; - http.IncomingMessage.prototype.login = http.IncomingMessage.prototype.logIn; - - http.IncomingMessage.prototype.logOut = IncomingMessageExt.logOut; - http.IncomingMessage.prototype.logout = http.IncomingMessage.prototype.logOut; - - http.IncomingMessage.prototype.isAuthenticated = IncomingMessageExt.isAuthenticated; - http.IncomingMessage.prototype.isUnauthenticated = IncomingMessageExt.isUnauthenticated; -}; diff --git a/lib/http/request.js b/lib/http/request.js index ccd46eef..d0c29123 100644 --- a/lib/http/request.js +++ b/lib/http/request.js @@ -4,10 +4,13 @@ // var http = require('http') // , req = http.IncomingMessage.prototype; +const http = require('http'); + +const req = http.IncomingMessage.prototype; /* eslint-disable no-multi-assign, camelcase, no-proto, no-shadow */ -const req = exports = module.exports = {}; +// const req = exports = module.exports = {}; /** * Initiate a login session for `user`. @@ -104,3 +107,5 @@ req.isAuthenticated = function isAuthenticated() { req.isUnauthenticated = function isUnauthenticated() { return !this.isAuthenticated(); }; + +module.exports = req; diff --git a/test/http/request.test.js b/test/http/request.test.js index 1d14ee14..527e9c7b 100644 --- a/test/http/request.test.js +++ b/test/http/request.test.js @@ -6,7 +6,7 @@ const http = require('http'); const Passport = require('../..').Passport; -require('../../lib/framework/connect').__monkeypatchNode(); +require('../../lib/framework/connect')(); describe('http.ServerRequest', () => {