Merge pull request #1 from ericjohney/hapi-v19

update to support hapi v19
soxhub · Feb 19, 2020 · c1d4b2f · c1d4b2f
2 parents 5842ebe + 854fdbd
commit c1d4b2f
Show file tree

Hide file tree

Showing 6 changed files with 271 additions and 220 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-8.9.1
+12.16.1
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,3 @@
 language: node_js
 node_js:
-  - "8"
+  - "12"
diff --git a/lib/index.js b/lib/index.js
@@ -8,7 +8,7 @@ exports.register = (server, options) => {
 		method: (request, h) => {
 			let remoteAddress = Forwarded(request.raw.req).pop().trim();
 			if (remoteAddress) {
-				request.info.remoteAddress = remoteAddress;
+				request.info._remoteAddress = remoteAddress;
 			}
 			return h.continue;
 		}

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "hapi-forwarded-for",
-  "version": "1.0.2",
-  "description": "hapi 17 plugin: sets request.info.remoteAddress from x-forwarded-for header",
+  "version": "2.0.0",
+  "description": "hapi 19 plugin: sets request.info.remoteAddress from x-forwarded-for header",
   "main": "lib/index.js",
   "scripts": {
     "test": "mocha test/index.js"
@@ -26,11 +26,11 @@
     "forwarded": "^0.1.2"
   },
   "peerDependencies": {
-    "hapi": "^17.1.1"
+    "@hapi/hapi": "^19.0.0"
   },
   "devDependencies": {
     "chai": "^4.1.2",
-    "hapi": "^17.1.1",
+    "@hapi/hapi": "^19.0.0",
     "mocha": "^4.0.1"
   }
 }
diff --git a/test/index.js b/test/index.js
@@ -3,7 +3,7 @@
 const chai = require('chai');
 const expect = chai.expect;
 
-const Hapi = require('hapi');
+const Hapi = require('@hapi/hapi');
 const HapiForwardedFor = require('..');
 
 describe('x-forwarded-for -> remoteAddress', function () {
@@ -53,4 +53,4 @@ describe('x-forwarded-for -> remoteAddress', function () {
         expect(res.statusCode).to.equal(200);
         expect(res.result).to.equal('127.0.0.1');
     });
-});
+});