Improve custom responses with Boom

packages/strapi/lib/configuration/hooks/core/responses/policy.js

@@ -7,17 +7,45 @@
 // Public node modules.
 const _ = require('lodash');
 const Boom = require('boom');
+const delegate = require('delegates');
 
 // Local utilities.
 const responses = require('./responses/index');
 
+// Custom function to avoid ctx.body repeat
+const createResponses = ctx => {
+  return _.merge(
+    responses,
+    _.mapValues(_.omit(Boom, ['wrap', 'create']), (fn, name) => (...rest) => {
+      ctx.body = fn(...rest);
+    })
+  );
+};
+
 /**
  * Policy used to add responses in the `this.response` object.
  */
 
 module.exports = async function (ctx, next) {
-  // Add the custom responses to the `ctx` object.
-  _.assign(ctx, responses, Boom);
+  const delegator = delegate(ctx, 'response');
+
+  _.forEach(createResponses(ctx), (value, key) => {
+    // Assign new error methods to context.response
+    ctx.response[key] = value;
+    // Delegate error methods to context
+    delegator.method(key);
+  });
+
+  try {
+    await next();
+
+    if (_.get(ctx.body, 'isBoom')) {
+      ctx.throw(ctx.status);
+    }
+  } catch (error) {
+    const formattedError = _.get(ctx.body, 'isBoom') ? ctx.body : Boom.wrap(error, error.status, ctx.body);
 
-  await next();
+    ctx.status = formattedError.output.statusCode || error.status || 500;
+    ctx.body = formattedError.output.payload;
+  }
 };

packages/strapi/lib/configuration/hooks/core/responses/responses/index.js

@@ -5,10 +5,6 @@
  */
 
 module.exports = {
-  badRequest: require('./badRequest'),
   created: require('./created'),
-  forbidden: require('./forbidden'),
-  notFound: require('./notFound'),
-  ok: require('./ok'),
-  serverError: require('./serverError')
+  send: require('./send')
 };

packages/strapi/lib/configuration/hooks/core/responses/responses/ok.js → packages/strapi/lib/configuration/hooks/core/responses/responses/send.js

@@ -1,7 +1,7 @@
 'use strict';
 
 /**
- * Default `ok` response.
+ * Default `send` response.
  */
 
 module.exports = function sendOk(data) {

packages/strapi/lib/configuration/hooks/core/router/index.js

@@ -185,22 +185,6 @@ module.exports = strapi => {
         strapi.app.use(router.middleware());
       });
 
-      // Wrap error into Boom object
-      strapi.app.use(async (ctx, next) => {
-        try {
-          await next();
-
-          if (ctx.status >= 400 || _.get(ctx.body, 'isBoom')) {
-            ctx.throw(ctx.status);
-          }
-        } catch (error) {
-          const formattedError = _.get(ctx.body, 'isBoom') ? ctx.body : Boom.wrap(error, error.status, ctx.body);
-
-          ctx.status = formattedError.output.statusCode || error.status || 500;
-          ctx.body = formattedError.output.payload;
-        }
-      });
-
       // Let the router use our routes and allowed methods.
       strapi.app.use(strapi.router.middleware());
       strapi.app.use(strapi.router.router.allowedMethods({
@@ -214,7 +198,7 @@ module.exports = strapi => {
       // Middleware used for every routes.
       // Expose the endpoint in `this`.
       function globalPolicy(endpoint, value, route) {
-        return async function (ctx, next) {
+        return async (ctx, next) => {
           ctx.request.route = {
             endpoint: _.trim(endpoint),
             controller: _.trim(value.controller),

packages/strapi/package.json

@@ -36,6 +36,7 @@
     "async": "^2.1.2",
     "boom": "^4.2.0",
     "consolidate": "~0.14.0",
+    "delegates": "^1.0.0",
     "kcors": "^2.2.0",
     "koa": "^2.0.0-alpha.7",
     "koa-better-static": "^1.0.5",