Split code into several files for readability

Author: kjellmorten

.eslintrc

@@ -2,8 +2,5 @@
  "extends": "eslint-config-hapi",
  "parserOptions": {
  "ecmaVersion": 9
- },
- "rules": {
- "prefer-arrow-callback": [ "error", { "allowNamedFunctions": true } ]
  }
 }

lib/IsJsonApiRequest.js

@@ -0,0 +1,16 @@
+'use strict';
+
+const IsJsonApiRequest = function (request) {
+
+ if (!request.headers.accept) {
+ return false;
+ }
+
+ if (request.headers.accept.indexOf('application/vnd.api+json') === -1) {
+ return false;
+ }
+
+ return true;
+};
+
+module.exports = IsJsonApiRequest;

lib/PreHandler.js

@@ -0,0 +1,38 @@
+'use strict';
+
+const Boom = require('boom');
+const MediaType = require('media-type');
+const IsJsonApiRequest = require('./IsJsonApiRequest');
+
+const validateMediaType = function (contentType) {
+
+ const contentMedia = MediaType.fromString(contentType);
+
+ // Ignore charset=UTF-8 media type parameter
+ // https://github.com/json-api/json-api/issues/837
+ if (contentMedia.parameters.charset === 'UTF-8') {
+ delete contentMedia.parameters.charset;
+ }
+
+ // Hapi does not allow application/* w/o json suffix so we don't need to test for it
+ if (contentMedia.type !== 'application' || contentMedia.subtype !== 'vnd.api' || Object.keys(contentMedia.parameters).length > 0) {
+
+ throw Boom.unsupportedMediaType('Only `application/vnd.api+json` content-type supported');
+ }
+};
+
+const validateAcceptAndContentTypeHeaders = function (request, respToolkit) {
+
+ if (!IsJsonApiRequest(request)) {
+ return respToolkit.continue;
+ }
+
+ const contentType = request.headers['content-type'];
+ if (contentType) {
+ validateMediaType(contentType);
+ }
+
+ return respToolkit.continue;
+};
+
+module.exports = validateAcceptAndContentTypeHeaders;

lib/PreResponse.js

@@ -0,0 +1,46 @@
+'use strict';
+
+const IsJsonApiRequest = require('./IsJsonApiRequest');
+
+const prepareOutput = function (request, meta) {
+
+ const { response } = request;
+ const { output } = response;
+
+ if (request.response.isBoom) {
+ const error = {
+ title: output.payload.error,
+ status: output.statusCode,
+ detail: output.payload.message
+ };
+ output.payload = {
+ errors: [error],
+ meta: { id: request.info.id, ...meta }
+ };
+ output.headers['content-type'] = 'application/vnd.api+json';
+ }
+ else {
+ if (response.source) {
+ response.source.meta = { id: request.info.id, ...meta };
+ }
+ response.headers['content-type'] = 'application/vnd.api+json';
+ }
+};
+
+const PreResponse = function (meta) {
+
+ return function convertBoomErrorsToJsonApiFormat(request, respToolkit) {
+
+ // Skip for OPTIONS requests and requests that don't accept application/vnd.api+json
+ if (request.method === 'options' || !IsJsonApiRequest(request)) {
+ return respToolkit.continue;
+ }
+
+ // Prepare output with correct headers and format
+ prepareOutput(request, meta);
+
+ return respToolkit.continue;
+ };
+};
+
+module.exports = PreResponse;

lib/index.js

@@ -1,93 +1,15 @@
 'use strict';
 
-// Load modules
-const Boom = require('boom');
-const MediaType = require('media-type');
-
-
-const isntJsonApiRequest = function isntJsonApiRequest(request) {
-
- if (!request.headers.accept) {
- return true;
- }
-
- if (request.headers.accept.indexOf('application/vnd.api+json') === -1) {
- return true;
- }
-
- return false;
-};
+const PreHandler = require('./PreHandler');
+const PreResponse = require('./PreResponse');
 
 module.exports = {
  pkg: require('../package.json'),
- register: (server, options) => {
+ register: (server, options = {}) => {
 
  const meta = options.meta || {};
 
- server.ext('onPreHandler', function validateAcceptAndContentTypeHeaders(request, respToolkit) {
-
- if (isntJsonApiRequest(request)) {
- return respToolkit.continue;
- }
-
- const contentType = request.headers['content-type'];
-
- if (contentType) {
- const contentMedia = MediaType.fromString(contentType);
-
- // Ignore charset=UTF-8 media type parameter
- // https://github.com/json-api/json-api/issues/837
- if (contentMedia.parameters.charset === 'UTF-8') {
- delete contentMedia.parameters.charset;
- }
-
- //Hapi does not allow application/* w/o json suffix so we don't need to test for it
- if (contentMedia.type !== 'application' || contentMedia.subtype !== 'vnd.api' || Object.keys(contentMedia.parameters).length > 0) {
-
- throw Boom.unsupportedMediaType('Only `application/vnd.api+json` content-type supported');
- }
- }
- return respToolkit.continue;
- });
-
- server.ext('onPreResponse', function convertBoomErrorsToJsonApiFormat(request, respToolkit) {
-
- const response = request.response;
-
- if (request.method === 'options') {
- return respToolkit.continue;
- }
-
- if (isntJsonApiRequest(request)) {
- return respToolkit.continue;
- }
-
- if (response.isBoom) {
- const error = {
- title: response.output.payload.error,
- status: response.output.statusCode,
- detail: response.output.payload.message
- };
- response.output.payload = {
- errors: [error],
- meta: { ...{ id: request.info.id }, ...meta }
- };
- response.output.headers['content-type'] = 'application/vnd.api+json';
- }
- else {
- if (response.source) {
- response.source.meta = { ...{ id: request.info.id }, ...meta };
- }
- response.headers['content-type'] = 'application/vnd.api+json';
- }
- return respToolkit.continue;
- });
-
+ server.ext('onPreHandler', PreHandler);
+ server.ext('onPreResponse', PreResponse(meta));
  }
 };
-
-
-
-
-
-