Merge pull request #9 from firstandthird/onPreResponse

onPreResponse

Author: orthagonal

.travis.yml

@@ -1,5 +1,4 @@
 language: node_js
 node_js:
+  - "8"
   - "6"
-  - "5"
-  - "4"

index.js

@@ -24,21 +24,35 @@ module.exports = (server, options, allDone) => {
   };
 
   if (options.method === 'append') {
-    server.ext('onRequest', (request, reply) => {
+    server.ext('onPreResponse', (request, reply) => {
+      const statusCode = request.response.output ? request.response.output.statusCode : request.response.statusCode;
+      // if the route was already found by hapi then just ignore it:
+      if (statusCode !== 404) {
+        return reply.continue();
+      }
       const method = request.method.toLowerCase();
+      // before failing, first check if there's a slashed route we can redirect to:
       if (['get', 'head'].indexOf(method) !== -1 && request.path[request.path.length - 1] !== '/') {
         const slashedPath = `${request.path}/`;
         return doRedirect(slashedPath, request, reply);
       }
+      // otherwise it really is a 404:
       return reply.continue();
     });
   } else if (options.method === 'remove') {
-    server.ext('onRequest', (request, reply) => {
+    server.ext('onPreResponse', (request, reply) => {
+      const statusCode = request.response.output ? request.response.output.statusCode : request.response.statusCode;
+      // if the route was already found by hapi then just ignore it:
+      if (statusCode !== 404) {
+        return reply.continue();
+      }
+      // before failing, check if there's an unslashed route we can redirect to:
       const method = request.method.toLowerCase();
       if (['get', 'head'].indexOf(method) !== -1 && request.path !== '/' && request.path[request.path.length - 1] === '/') {
         const slashlessPath = request.path.replace(/\/$/, '');
         return doRedirect(slashlessPath, request, reply);
       }
+      // otherwise it really is a 404:
       return reply.continue();
     });
   }

test/append.test.js

@@ -70,7 +70,25 @@ lab.experiment('hapi-trailing-slash', () => {
       done();
     });
   });
-  lab.test(' "append" /has/slash redirects to /has/slash/', (done) => {
+  lab.test(' "append" /has/slash works normally if that route is specified', (done) => {
+    server.route({
+      path: '/has/slash',
+      method: 'get',
+      handler(request, reply) {
+        return reply('slither');
+      }
+    });
+    server.inject({
+      method: 'get',
+      url: '/has/slash'
+    }, (result) => {
+      Code.expect(result.statusCode).to.equal(200);
+      Code.expect(result.payload).to.equal('slither');
+      done();
+    });
+  });
+
+  lab.test(' "append" GET /has/slash redirects to /has/slash/', (done) => {
     server.inject({
       method: 'get',
       url: '/has/slash'

test/remove.test.js

@@ -24,7 +24,7 @@ lab.experiment('hapi-trailing-slash', () => {
         method: 'GET',
         path: '/no/slash',
         handler: (request, reply) => {
-          reply('welcome to the jungle');
+          reply('chinese democracy');
         }
       },
       {
@@ -80,23 +80,48 @@ lab.experiment('hapi-trailing-slash', () => {
     server.stop(done);
   });
 
-  lab.test(' "remove" /no/slash works normally', (done) => {
+  lab.test(' "remove" /no/slash when called correctly returns 200', (done) => {
     server.inject({
       method: 'get',
       url: '/no/slash'
     }, (result) => {
       Code.expect(result.statusCode).to.equal(200);
-      Code.expect(result.payload).to.equal('welcome to the jungle');
+      Code.expect(result.payload).to.equal('chinese democracy');
       done();
     });
   });
-  lab.test(' "remove" /no/slash/ redirects to /no/slash', (done) => {
+
+  lab.test(' "remove" /no/slash/ works normally if that route is specified', (done) => {
+    server.route({
+      path: '/no/slash/',
+      method: 'get',
+      handler(request, reply) {
+        return reply('chinese democracy');
+      }
+    });
+    server.inject({
+      method: 'get',
+      url: '/no/slash/'
+    }, (result) => {
+      Code.expect(result.statusCode).to.equal(200);
+      Code.expect(result.payload).to.equal('chinese democracy');
+      done();
+    });
+  });
+
+  lab.test(' "remove" /no/slash/ when called with trailing slash returns 301 Redirect to /no/slash', (done) => {
+    let called = 0;
+    server.ext('onRequest', (request, reply) => {
+      called++;
+      reply.continue();
+    });
     server.inject({
       method: 'get',
       url: '/no/slash/'
     }, (result) => {
       Code.expect(result.statusCode).to.equal(301);
       Code.expect(result.headers.location).to.equal('/no/slash');
+      Code.expect(called).to.equal(1);
       done();
     });
   });
@@ -110,10 +135,10 @@ lab.experiment('hapi-trailing-slash', () => {
       done();
     });
   });
-  lab.test(' "remove" /no/slash GET works normally ', (done) => {
+  lab.test(' "remove" /no/slash GET works normally with route params', (done) => {
     server.inject({
       method: 'get',
-      url: '/no/slash/velvet_revolver'
+      url: '/no/slash/velvet_revolver?p1=hi'
     }, (result) => {
       Code.expect(result.statusCode).to.equal(200);
       Code.expect(result.payload).to.equal('slither');