@dwp/govuk-casa 8.2.0 → 8.2.1

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [8.2.1](https://github.com/dwp/govuk-casa/compare/8.2.0...8.2.1) (2022-05-20)
+
+
+### Bug Fixes
+
+* preserve compatibility with existing proxy mounting methods ([41040e6](https://github.com/dwp/govuk-casa/commit/41040e6ac891ec64ce4b70328dda333178c48b99))
+
 ## [8.2.0](https://github.com/dwp/govuk-casa/compare/8.1.0...8.2.0) (2022-05-17)
 
 

package/dist/lib/configure.js

@@ -154,11 +154,33 @@ function configure(config = {}) {
         // Using `config.mountUrl` rather than `mountUrl` here to test whether the
         // consumer explicitly set a `mountUrl`, in which case we're dealing with
         // backwards-compatibility mode.
+        //
+        // This intervention would not be needed for apps that omit `mountUrl` as if
+        // so, it's assumed they're following the guidance for setting up a proxy
+        // as described in `docs/guides/setup-behind-a-proxy.md`.
         if (config.mountUrl) {
             log.warn('[DEPRECATION WARNING] Using configuration attribute, mountUrl. This will be removed in an upcoming major version');
             app.use((req, res, next) => {
+                // Mimic what the `docs/guides/setup-behind-a-proxy.md` guidance
+                // recommends for stripping off any proxy prefixes to leave just the
+                // "mountUrl" remaining.
+                const originalBaseUrl = req.baseUrl;
                 req.baseUrl = mountUrl.replace(/\/$/, '');
-                next();
+                // If the app has been mounted directly on the specific `mountUrl`, then
+                // there's nothing we need to do and can let this request pass-through.
+                if (req.baseUrl === originalBaseUrl) {
+                    next();
+                }
+                else if (req.__CASA_BASE_URL_REWRITTEN__) {
+                    delete req.__CASA_BASE_URL_REWRITTEN__;
+                    next();
+                }
+                else {
+                    // Issuing this call will re-run this same middleware, so we use this
+                    // `__CASA_BASE_URL_REWRITTEN__` flag to prevent recursion.
+                    req.__CASA_BASE_URL_REWRITTEN__ = true;
+                    req.app.handle(req, res, next);
+                }
             });
         }
         // Attach a handler to redirect requests for `/` to the first waypoint in

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dwp/govuk-casa",
-  "version": "8.2.0",
+  "version": "8.2.1",
   "description": "A framework for building GOVUK Collect-And-Submit-Applications",
   "repository": {
     "type": "git",