add response callback for error and bad status

electrode-io · Aug 3, 2018 · 54652fb · 54652fb
1 parent 82495cb
commit 54652fb
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 10 deletions.
diff --git a/packages/electrode-react-webapp/lib/express/index.js b/packages/electrode-react-webapp/lib/express/index.js
@@ -6,7 +6,7 @@ const _ = require("lodash");
 const assert = require("assert");
 const ReactWebapp = require("../react-webapp");
 const HttpStatus = require("../http-status");
-const { htmlifyError } = require("../utils");
+const { responseForError, responseForBadStatus } = require("../utils");
 
 const DefaultHandleRoute = (request, response, handler, content, routeOptions) => {
   return handler({ content, mode: request.query.__mode || "", request })
@@ -28,11 +28,13 @@ const DefaultHandleRoute = (request, response, handler, content, routeOptions) =
       } else if (status >= 200 && status < 300) {
         response.send(data.html !== undefined ? data.html : data);
       } else {
-        response.status(status).send(data);
+        const output = routeOptions.responseForBadStatus(request, routeOptions, data);
+        response.status(output.status).send(output.html);
       }
     })
     .catch(err => {
-      response.status(err.status || 500).send(htmlifyError(err, routeOptions.replyErrorStack));
+      const output = routeOptions.responseForError(request, routeOptions, err);
+      response.status(output.status).send(output.html);
     });
 };
 
@@ -56,6 +58,7 @@ const registerRoutes = (app, options, next = () => {}) => {
     const routeOptions = _.defaults({ htmlFile: v.htmlFile }, registerOptions);
     const routeHandler = ReactWebapp.makeRouteHandler(routeOptions);
     const handleRoute = options.handleRoute || DefaultHandleRoute;
+    _.defaults(routeOptions, { responseForError, responseForBadStatus });
     let content;
 
     /*eslint max-nested-callbacks: [0, 4]*/

diff --git a/packages/electrode-react-webapp/lib/hapi/index.js b/packages/electrode-react-webapp/lib/hapi/index.js
@@ -6,7 +6,7 @@ const _ = require("lodash");
 const assert = require("assert");
 const ReactWebapp = require("../react-webapp");
 const HttpStatus = require("../http-status");
-const { htmlifyError } = require("../utils");
+const { responseForError, responseForBadStatus } = require("../utils");
 
 const DefaultHandleRoute = (request, reply, handler, content, routeOptions) => {
   return handler({
@@ -34,7 +34,9 @@ const DefaultHandleRoute = (request, reply, handler, content, routeOptions) => {
       } else if (HttpStatus.displayHtml[status] || (status >= 200 && status < 300)) {
         respond = reply(data.html !== undefined ? data.html : data);
       } else {
-        respond = reply(data);
+        const output = routeOptions.responseForBadStatus(request, routeOptions, data);
+        status = output.status;
+        respond = reply(output.html);
       }
 
       const response = context.user && context.user.response;
@@ -46,12 +48,15 @@ const DefaultHandleRoute = (request, reply, handler, content, routeOptions) => {
       return respond.code(status);
     })
     .catch(err => {
-      reply(htmlifyError(err, routeOptions.replyErrorStack)).code(err.status || 500);
+      const output = routeOptions.responseForError(request, routeOptions, err);
+
+      reply(output.html).code(output.status);
     });
 };
 
 const registerRoutes = (server, options) => {
   const registerOptions = ReactWebapp.setupOptions(options);
+
   _.each(registerOptions.paths, (pathData, path) => {
     const resolveContent = () => {
       if (registerOptions.serverSideRendering !== false) {
@@ -61,6 +66,7 @@ const registerRoutes = (server, options) => {
         );
         return ReactWebapp.resolveContent(pathData.content);
       }
+
       return {
         content: {
           status: 200,
@@ -72,6 +78,7 @@ const registerRoutes = (server, options) => {
     const routeOptions = ReactWebapp.setupPathOptions(registerOptions, path);
     const routeHandler = ReactWebapp.makeRouteHandler(routeOptions);
     const handleRoute = options.handleRoute || DefaultHandleRoute;
+    _.defaults(routeOptions, { responseForError, responseForBadStatus });
     let content;
 
     server.route({

diff --git a/packages/electrode-react-webapp/lib/koa/index.js b/packages/electrode-react-webapp/lib/koa/index.js
@@ -7,7 +7,7 @@ const _ = require("lodash");
 const assert = require("assert");
 const ReactWebapp = require("../react-webapp");
 const HttpStatus = require("../http-status");
-const { htmlifyError } = require("../utils");
+const { responseForError, responseForBadStatus } = require("../utils");
 
 function DefaultHandleRoute(handler, content, routeOptions) {
   const request = this.request;
@@ -35,11 +35,13 @@ function DefaultHandleRoute(handler, content, routeOptions) {
       } else if (status >= 200 && status < 300) {
         respond(status, data.html !== undefined ? data.html : data);
       } else {
-        respond(status, data);
+        const output = routeOptions.responseForBadStatus(request, routeOptions, data);
+        respond(output.status, output.html);
       }
     })
     .catch(err => {
-      respond(err.status || 500, htmlifyError(err, routeOptions.replyErrorStack));
+      const output = routeOptions.responseForError(request, routeOptions, err);
+      respond(output.status, output.html);
     });
 }
 
@@ -62,6 +64,7 @@ const registerRoutes = (router, options) => {
     const routeOptions = _.defaults({ htmlFile: v.htmlFile }, registerOptions);
     const routeHandler = ReactWebapp.makeRouteHandler(routeOptions);
     const handleRoute = options.handleRoute || DefaultHandleRoute;
+    _.defaults(routeOptions, { responseForError, responseForBadStatus });
     let content;
 
     let methods = v.method || ["GET"];

diff --git a/packages/electrode-react-webapp/lib/utils.js b/packages/electrode-react-webapp/lib/utils.js
@@ -187,6 +187,20 @@ function getCspNonce(request, cspNonceValue) {
 
 const resolvePath = path => (!Path.isAbsolute(path) ? Path.resolve(path) : path);
 
+function responseForError(request, routeOptions, err) {
+  return {
+    status: err.status || 500,
+    html: htmlifyError(err, routeOptions.replyErrorStack)
+  };
+}
+
+function responseForBadStatus(request, routeOptions, data) {
+  return {
+    status: data.status,
+    html: data
+  };
+}
+
 module.exports = {
   resolveChunkSelector,
   loadAssetsFromStats,
@@ -199,5 +213,7 @@ module.exports = {
   getDevJsBundle,
   getProdBundles,
   processRenderSsMode,
-  getCspNonce
+  getCspNonce,
+  responseForError,
+  responseForBadStatus
 };