Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix VA redirects for nested paths #2236

Merged
merged 2 commits into from
Mar 26, 2024
Merged

Fix VA redirects for nested paths #2236

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24f8afd
Fix VA redirects for nested paths
SamyPesse Mar 26, 2024
e774bd3
Improve comment
SamyPesse Mar 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion src/middleware.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
Loading