gsadmin/gitbook
1
0
Fork 0
mirror of https://github.com/GitbookIO/gitbook.git synced 2026-09-16 23:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix resolution of URL for collection URLs (#88)

Browse Source
This commit is contained in:
Samy Pessé
2024-01-07 23:19:05 +01:00
committed by GitHub
parent 5f6ca7af56
commit 28be5aaeca
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/middleware.ts
+13 -11
View File
@@ -441,25 +441,27 @@ function computeLookupAlternatives(url: URL) {
const pathSegments = url.pathname.slice(1).split('/');
// Match with only the first segment of the path
// URL looks like a collection url (with /v/ in the path)
// We only start matching after the /v/ segment and we ignore everything before it
// to avoid potentially matching as a page not found under the default space in the collection
if (pathSegments.includes('v')) {
const collectionURL = new URL(url);
const vIndex = pathSegments.indexOf('v');
collectionURL.pathname = pathSegments.slice(0, vIndex + 2).join('/');
pushAlternative(collectionURL, pathSegments.slice(vIndex + 2).join('/'));
}
// Otherwise match with only the first segment of the path
// as it could potentially a space in an organization or collection domain
// or a space using a share link secret
if (pathSegments.length > 0) {
else if (pathSegments.length > 0) {
const shortURL = new URL(url);
shortURL.pathname = pathSegments[0];
pushAlternative(shortURL, pathSegments.slice(1).join('/'));
}
// URL looks like a collection url (with /v/ in the path)
if (pathSegments.includes('v')) {
const collectionURL = new URL(url);
const vIndex = pathSegments.indexOf('v');
collectionURL.pathname = pathSegments.slice(0, vIndex + 1).join('/');
pushAlternative(collectionURL, pathSegments.slice(vIndex + 1).join('/'));
}
// Always try with the full URL
if (!alternatives.some((alt) => alt.url === url.toString())) {
pushAlternative(url, '');