From 027bfc00167705fbbaccb6510d32528114d467a7 Mon Sep 17 00:00:00 2001
From: Noah Loomans <noahloomans@gmail.com>
Date: Tue, 20 Mar 2018 20:23:32 +0100
Subject: Fix server side error handeling

---
 src/server/app.js | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

(limited to 'src')

diff --git a/src/server/app.js b/src/server/app.js
index 866e39b..4b17290 100644
--- a/src/server/app.js
+++ b/src/server/app.js
@@ -55,28 +55,29 @@ app.use((req, res, next) => {
   next(err);
 });
 
-// error handlers
+function extractStatusCodeFromError(error) {
+  if (error.status) {
+    return error.status;
+  } else if (error.response) {
+    return error.response.status;
+  }
 
-// development error handler
-// will print stacktrace
-if (app.get('env') === 'development') {
-  app.use((err, req, res) => {
-    res.status(err.status || 500);
-    res.render('error', {
-      message: err.message,
-      error: err,
-    });
-  });
+  return null;
 }
 
-// production error handler
-// no stacktraces leaked to user
-app.use((err, req, res) => {
-  res.status(err.status || 500);
+// error handler
+app.use((error, req, res, next) => {
+  const errorCode = extractStatusCodeFromError(error) || 500;
+  res.status(errorCode);
+
   res.render('error', {
-    message: err.message,
-    error: {},
+    message: error.message,
+    error,
   });
+
+  if (error === 500) {
+    next(error);
+  }
 });
 
 module.exports = app;
-- 
cgit v1.1