@apolitical/server 2.3.0-rc.fallback.4 → 2.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apolitical/server",
-  "version": "2.3.0-rc.fallback.4",
+  "version": "2.3.0",
   "description": "Node.js module to encapsulate Apolitical's express server setup",
   "author": "Apolitical Group Limited <engineering@apolitical.co>",
   "license": "MIT",

package/src/loaders/middlewares.loader.js

@@ -12,7 +12,7 @@ module.exports = ({
 }) => {
   const { BODY_PARSER_OPTIONS, CORS_OPTIONS } = config.SERVER;
 
-  return function load(app, { staticFiles, corsOptions, prerenderToken }) {
+  return function load(app, { corsOptions, prerenderToken, staticFiles }) {
     const childLogger = logger.where(__filename, 'load');
     childLogger.debug('Started');
     // Load useful middlewares

package/src/middlewares/error.middleware.js

@@ -45,11 +45,14 @@ module.exports =
       }
 
       if (redirectURL) {
-        res.redirect(TEMPORARY_REDIRECT, `${redirectURL}?errorMessage=${encodeURI(message)}`);
-      } else if (fallbackController && message === 'Unexpected error: Cannot read items') {
-        fallbackController(req, res);
-      } else {
-        res.status(code).json({ message, errors });
+        return res.redirect(TEMPORARY_REDIRECT, `${redirectURL}?errorMessage=${encodeURI(message)}`);
+      }
+      if (fallbackController) {
+        // more known error messages can be added here
+        if (message === 'Unexpected error: Cannot read items') {
+          return fallbackController(req, res);
+        }
       }
+      return res.status(code).json({ message, errors });
     };
   };

package/src/services/server.service.js

@@ -52,10 +52,8 @@ module.exports = ({
       }
       // Load documentation
       documentationLoader(app, opts);
-
-      // Load static resources or fallback
+      // Load fallback routing
       fallbackLoader(app, opts);
-
       // Use error handler
       if (opts.handleErrors) {
         app.use(errorMiddleware(opts));