Merge pull request #34 from firstandthird/logFullPath

log full path

lib/index.js

@@ -99,6 +99,10 @@ module.exports = async (server, pluginOptions) => {
     // let the url parser format the correct redirect Location:
     const fullRedirectLocation = redirectToUrl.format();
 
+    let from = request.path;
+    if (Object.keys(request.query).length !== 0) {
+      from = `${from}?${querystring.stringify(request.query)}`;
+    }
     // log the route info:
     server.log(['hapi-redirect', 'redirect', 'info'], {
       remoteAddress: `${request.info.remoteAddress}:${request.info.remotePort}`,
@@ -108,7 +112,7 @@ module.exports = async (server, pluginOptions) => {
       referrer: request.info.referrer,
       routePath: route,
       to: fullRedirectLocation,
-      from: request.path
+      from
     });
 
     // now emit the event and do the redirect:

test/redirects.test.js

@@ -1,5 +1,5 @@
 'use strict';
-const Code = require('code');   // assertion library
+const Code = require('code'); // assertion library
 const Lab = require('lab');
 const lab = exports.lab = Lab.script();
 const Hapi = require('hapi');
@@ -534,4 +534,32 @@ lab.experiment('hapi-redirect', () => {
     });
     Code.expect(result.statusCode).to.equal(404);
   });
+
+  lab.test(' logs output', async() => {
+    await server.register({
+      plugin: redirectModule,
+      options: {
+        redirects: {
+          '/': '/it/works?test=1',
+        },
+      }
+    });
+    await server.start();
+    let called = false;
+    server.events.on('log', (input, tags) => {
+      Code.expect(input.data.to).to.equal('/it/works?moniker=hugo&test=1');
+      Code.expect(input.data.from).to.equal('/?moniker=hugo');
+      Code.expect(input.data.referrer).to.equal('a wandering clown');
+      called = true;
+    });
+    await server.inject({
+      method: 'get',
+      headers: {
+        referrer: 'a wandering clown'
+      },
+      url: '/?moniker=hugo'
+    });
+    await new Promise(resolve => setTimeout(resolve, 500));
+    Code.expect(called).to.equal(true);
+  });
 });