[DURACOM-344] refactor solution

Author: FrancescoMolinaro

server.ts

@@ -209,9 +209,9 @@ export function app() {
 
   /**
    * Default sending all incoming requests to ngApp() function, after first checking for a cached
-   * copy of the page (see cacheAndErrorStatusCheck())
+   * copy of the page (see cacheCheck())
    */
-  router.get('*', cacheAndErrorStatusCheck, ngApp);
+  router.get('*', cacheCheck, ngApp);
 
   server.use(environment.ui.nameSpace, router);
 
@@ -375,7 +375,7 @@ function anonymousCacheEnabled(): boolean {
  * Check if the currently requested page is in our server-side, in-memory cache.
  * Caching is ONLY done for SSR requests. Pages are cached base on their path (e.g. /home or /search?query=test)
  */
-function cacheAndErrorStatusCheck(req, res, next) {
+function cacheCheck(req, res, next) {
   // Cached copy of page (if found)
   let cachedCopy;
 
@@ -399,7 +399,6 @@ function cacheAndErrorStatusCheck(req, res, next) {
       });
     }
     res.locals.ssr = true;  // mark response as SSR-generated (enables text compression)
-    setRequestErrorStatus(req, res);
     res.send(cachedCopy.page);
 
     // Tell Express to skip all other handlers for this path
@@ -408,25 +407,10 @@ function cacheAndErrorStatusCheck(req, res, next) {
   } else {
     // If nothing found in cache, just continue with next handler
     // (This should send the request on to the handler that rerenders the page via SSR
-    setRequestErrorStatus(req, res);
     next();
   }
 }
 
-/**
- * Set request status code when serving an error page from SSR
- * @param req
- * @param res
- */
-function setRequestErrorStatus(req, res) {
-  if (req.url === getPageInternalServerErrorRoute()) {
-    res.status(500)
-  } else if (req.url === getPageNotFoundRoute()) {
-    res.status(404)
-  } else if (req.url === getForbiddenRoute()) {
-    res.status(403)
-  }
-}
 
 /**
  * Checks if the current request (i.e. page) is found in the given cache. If it is found,

src/environments/environment.production.ts

@@ -10,7 +10,7 @@ export const environment: Partial<BuildConfig> = {
     inlineCriticalCss: false,
     transferState: true,
     replaceRestUrl: true,
-    paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/', '/reload/' ],
+    paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/', '/reload/', '/500', '/404', '/403' ],
     enableSearchComponent: false,
     enableBrowseComponent: false,
   },