Fix VA redirects for nested paths (#2236)

GitbookIO · Mar 26, 2024 · ee7a74f · ee7a74f
1 parent 0d99906
commit ee7a74f
Showing 1 changed file with 17 additions and 1 deletion.
diff --git a/src/middleware.ts b/src/middleware.ts
@@ -569,7 +569,23 @@ async function lookupSpaceByAPI(
         }
 
         if ('redirect' in data) {
-            if (alternative.url === url.toString()) {
+            if (alternative.primary) {
+                // Append the path to the redirect URL if it's a VA redirect
+                // because we might have matched a shorter path and the redirect is relative to it
+                if (alternative.extraPath) {
+                    const redirect = new URL(data.redirect);
+                    if (redirect.searchParams.has('location')) {
+                        redirect.searchParams.set(
+                            'location',
+                            joinPath(
+                                redirect.searchParams.get('location') ?? '',
+                                alternative.extraPath,
+                            ),
+                        );
+                        data.redirect = redirect.toString();
+                    }
+                }
+
                 return data;
             }