Merge pull request #14 from holidayextras/hapiV17

Hapi v17

Author: t1gr0u

.nvmrc

@@ -1 +1 @@
-6.9.4
+8

circle.yml

@@ -1,6 +1,6 @@
 machine:
   node:
-    version: 6.9.4
+    version: 8.9.4
 dependencies:
   pre:
     - npm install git+ssh://git@github.com:holidayextras/deployment-helpers.git

lib/pluginJsonapi.js

@@ -31,17 +31,16 @@ pluginJsonApi.errorHandler = function errorHandler (request, reply, error) {
     data: request.data
   })
 
-  return reply(Boom.internal(error))
+  return Boom.internal(error)
 }
 
 pluginJsonApi.alsoMakeItSo = function alsoMakeItSo (request, reply) {
  // eslint-disable-line consistent-return
-
   try {
     // If there was no error and it's not one of our ignoredPaths or ignored status codes, jsonapi it
     if (request.response.isBoom || _.includes(ignorePaths, _.get(request, 'route.path')) || _.includes(ignoreStatusCodes, request.response.statusCode)) {
       // return early
-      return reply.continue()
+      return reply.continue
     }
 
     // Make the response a bit more accessible
@@ -55,7 +54,7 @@ pluginJsonApi.alsoMakeItSo = function alsoMakeItSo (request, reply) {
     var resources = result[request.route.settings.bind.resourceName]
     if (!resources) {
       // no resources, return early
-      return reply.continue()
+      return reply.continue
     }
 
     var stateObject = {
@@ -72,19 +71,18 @@ pluginJsonApi.alsoMakeItSo = function alsoMakeItSo (request, reply) {
      * getResources() - get the resources
      * resolveLinkedData() - resolve the sub resources which we have collected previously
      */
-    utilities.collectIncludes(stateObject)
+    return utilities.collectIncludes(stateObject)
     .then(utilities.collectProxyableValues)
     .then(utilities.getSubResources)
     .then(utilities.getResources)
     .then(utilities.resolveLinkedData)
     .then(function () {
       // all done
-      return reply.continue()
+      return reply.continue
     })
     .fail(function (error) {
       return pluginJsonApi.errorHandler(request, reply, error)
     })
-    .done()
   } catch (error) {
     return pluginJsonApi.errorHandler(request, reply, error)
   }
@@ -94,10 +92,9 @@ pluginJsonApi.alsoMakeItSo = function alsoMakeItSo (request, reply) {
 * Registers the plugin when the hapi server bootstraps - follows the convention for Hapi.js plugins
 * @param {object} server - the hapi plugin object
 * @param {object} options - any initial options needed to set up the plugin
-* @param {function} next - the next plugin to be set up
 * @returns {undefined} Nothing - calls the next plugin
 */
-pluginJsonApi.register = function (server, options, next) {
+const register = function (server, options) {
   function makeItSo (request, reply) {
     return pluginJsonApi.alsoMakeItSo(request, reply)
   }
@@ -109,10 +106,14 @@ pluginJsonApi.register = function (server, options, next) {
   if (process.env.NODE_ENV === 'test') {
     server.expose('makeItSo', makeItSo)
   }
-
-  next()
 }
 
-pluginJsonApi.register.attributes = {
-  pkg: require('../package.json')
+const pkg = require('../package.json')
+const {version, name} = pkg
+
+pluginJsonApi.plugin = {
+  register,
+  name,
+  version,
+  pkg
 }

lib/utilities.js

@@ -182,8 +182,7 @@ utilities.getSubResources = function getSubResources (stateObject) {
 }
 
 // request the sub resources
-utilities._requestSubResource = function _requestSubResource (request, info, type, proxiedValues) {
-  var proxyDeferred = Q.defer()
+utilities._requestSubResource = async function _requestSubResource (request, info, type, proxiedValues) {
   var hrefParameters = {
     type: type,
     ids: info.ids
@@ -202,24 +201,21 @@ utilities._requestSubResource = function _requestSubResource (request, info, typ
     headerHost += ':' + request.auth.artifacts.port
   }
 
-  request.server.inject({
+  const response = await request.server.inject({
     url: subResourceUrl,
     credentials: request.auth.credentials,
     artifacts: request.auth.artifacts,
     headers: {
       host: headerHost
     }
-  }, function (response) {
-    // Append the result to our linked property if it responded without an error
-    if (!response.result.error) {
-      proxyDeferred.resolve(response.result)
-    } else {
-      // Return an empty object, we can send out as much content as we have, except this one...
-      proxyDeferred.resolve({})
-    }
   })
-
-  return proxyDeferred.promise
+  // Append the result to our linked property if it responded without an error
+  if (!response.result.error) {
+    return response.result
+  } else {
+    // Return an empty object, we can send out as much content as we have, except this one...
+    return {}
+  }
 }
 
 // resolve the the sub resources and attach them to the linked element