@tryghost/mw-error-handler 0.1.4 → 0.1.7

package/lib/mw-error-handler.js

@@ -36,7 +36,8 @@ const messages = {
         HostLimitError: 'Host Limit error, cannot {action}.',
         DisabledFeatureError: 'Theme validation error, the {{{helperName}}} helper is not available. Cannot {action}.',
         UpdateCollisionError: 'Saving failed! Someone else is editing this post.'
-    }
+    },
+    UnknownError: 'Unknown error - {name}, cannot {action}.'
 };
 
 /**
@@ -78,8 +79,6 @@ module.exports.prepareError = (err, req, res, next) => {
     // alternative for res.status();
     res.statusCode = err.statusCode;
 
-    prepareStackForUser(err);
-
     // never cache errors
     res.set({
         'Cache-Control': 'no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0'
@@ -88,6 +87,12 @@ module.exports.prepareError = (err, req, res, next) => {
     next(err);
 };
 
+module.exports.prepareStack = (err, req, res, next) => { // eslint-disable-line no-unused-vars
+    const clonedError = prepareStackForUser(err);
+
+    next(clonedError);
+};
+
 const jsonErrorRenderer = (err, req, res, next) => { // eslint-disable-line no-unused-vars
     res.json({
         errors: [{
@@ -157,7 +162,11 @@ const prepareUserMessage = (err, req) => {
                 userError.context = err.message;
             }
 
-            userError.message = tpl(messages.userMessages[err.name], {action: action});
+            if (_.get(messages.userMessages, err.name)) {
+                userError.message = tpl(messages.userMessages[err.name], {action: action});
+            } else {
+                userError.message = tpl(messages.UnknownError, {action, name: err.name});
+            }
         }
     }
 
@@ -173,27 +182,33 @@ module.exports.pageNotFound = (req, res, next) => {
 };
 
 module.exports.handleJSONResponse = sentry => [
-    // Handle the error in Sentry
-    sentry.errorHandler,
     // Make sure the error can be served
     module.exports.prepareError,
+    // Handle the error in Sentry
+    sentry.errorHandler,
+    // Format the stack for the user
+    module.exports.prepareStack,
     // Render the error using JSON format
     jsonErrorRenderer
 ];
 
 module.exports.handleJSONResponseV2 = sentry => [
-    // Handle the error in Sentry
-    sentry.errorHandler,
     // Make sure the error can be served
     module.exports.prepareError,
+    // Handle the error in Sentry
+    sentry.errorHandler,
+    // Format the stack for the user
+    module.exports.prepareStack,
     // Render the error using JSON format
     jsonErrorRendererV2
 ];
 
 module.exports.handleHTMLResponse = sentry => [
+    // Make sure the error can be served
+    module.exports.prepareError,
     // Handle the error in Sentry
     sentry.errorHandler,
-    // Make sure the error can be served
-    module.exports.prepareError
+    // Format the stack for the user
+    module.exports.prepareStack
 ];
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tryghost/mw-error-handler",
-  "version": "0.1.4",
+  "version": "0.1.7",
   "repository": "https://github.com/TryGhost/Utils/tree/main/packages/mw-error-handler",
   "author": "Ghost Foundation",
   "license": "MIT",
@@ -26,9 +26,9 @@
   },
   "dependencies": {
     "@tryghost/debug": "^0.1.9",
-    "@tryghost/errors": "1.2.5",
+    "@tryghost/errors": "^1.2.5",
     "@tryghost/tpl": "^0.1.8",
-    "lodash": "4.17.21"
+    "lodash": "^4.17.21"
   },
-  "gitHead": "3bf8b2007541db078debd4d6b4b9f16e66f08c60"
+  "gitHead": "b44db9dbd6382d426125bd9627cb193a8360a2c2"
 }