@apolitical/server 2.2.0-rc.fallback.2 → 2.2.0-rc.fallback.3

package/package.json

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

package/src/container.js

@@ -36,7 +36,7 @@ const documentationLoader = require('./loaders/documentation.loader');
 const loggerLoader = require('./loaders/logger.loader');
 const middlewaresLoader = require('./loaders/middlewares.loader');
 const probesLoader = require('./loaders/probes.loader');
-const fallbackLoader = require('./loaders/fallback.loader');
+const fallbackController = require('./controllers/fallback.controller');
 // Middleware
 const authenticationMiddleware = require('./middlewares/authentication.middleware');
 const authorisationMiddleware = require('./middlewares/authorisation.middleware');
@@ -85,7 +85,7 @@ container.register({
   loggerLoader: asFunction(loggerLoader).singleton(),
   middlewaresLoader: asFunction(middlewaresLoader).singleton(),
   probesLoader: asFunction(probesLoader).singleton(),
-  fallbackLoader: asFunction(fallbackLoader).singleton(),
+  fallbackController: asFunction(fallbackController).singleton(),
   // Middlewares
   authenticationMiddleware: asFunction(authenticationMiddleware).singleton(),
   authorisationMiddleware: asFunction(authorisationMiddleware).singleton(),

package/src/{loaders/fallback.loader.js → controllers/fallback.controller.js}

@@ -1,15 +1,15 @@
 'use strict';
 
 module.exports = ({ logger }) => {
-  return function load(app, { fallbackLoader, staticFiles }) {
+  return function load(app, { fallbackController, staticFiles }) {
     const childLogger = logger.where(__filename, 'load');
     childLogger.debug('Started');
 
     if (staticFiles) {
       const { baseUrl, indexFilePath } = staticFiles;
       // Load fallback or static content
-      if (fallbackLoader) {
-        app.get(`${baseUrl}*`, fallbackLoader);
+      if (fallbackController) {
+        app.get(`${baseUrl}*`, fallbackController);
       } else if (indexFilePath) {
         app.get(`${baseUrl}*`, function (req, res) {
           res.sendFile(indexFilePath);

package/src/middlewares/error.middleware.js

@@ -9,7 +9,7 @@ module.exports =
     logger,
     serverError: { GeneralError },
   }) =>
-  ({ labels, redirectURL }) => {
+  ({ labels, redirectURL, fallbackController }) => {
     // Apolitical Logger (with service metadata)
     const errorLogger = logger.where(__filename, 'errorMiddleware', labels);
 
@@ -43,8 +43,11 @@ module.exports =
       } else {
         errorLogger.warn(message, { errors });
       }
+
       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 });
       }

package/src/services/server.service.js

@@ -11,7 +11,7 @@ module.exports = ({
   errorMiddleware,
   middlewaresLoader,
   probesLoader,
-  fallbackLoader,
+  fallbackController,
   jwtService,
   serverError,
 }) => {
@@ -54,7 +54,7 @@ module.exports = ({
       documentationLoader(app, opts);
 
       // Load static resources or fallback
-      fallbackLoader(app, opts);
+      fallbackController(app, opts);
 
       // Use error handler
       if (opts.handleErrors) {