gsadmin/gitbook
1
0
Fork 0
mirror of https://github.com/GitbookIO/gitbook.git synced 2026-09-21 01:53:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix incoming URL for requests that were proxied (#3127)

Browse Source
This commit is contained in:
Taran Vohra
2025-04-09 19:10:14 +05:30
committed by GitHub
parent eedefdd5c9
commit 42342893d6
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.changeset/fresh-peaches-smoke.md
+5
View File
@@ -0,0 +1,5 @@
---
"gitbook-v2": patch
---
Fix incoming URL for requests that were proxied
packages/gitbook-v2/src/middleware.ts
+10 -7
View File
@@ -148,18 +148,21 @@ async function serveSiteRoutes(requestURL: URL, request: NextRequest) {
// correctly generated when the site is proxied. e.g. https://proxy.gitbook.com/site/siteId/...
const siteCanonicalURL = new URL(siteURLData.canonicalUrl);
let incomingURL = requestURL;
// For cases where the site is proxied, we use the canonical URL
// as the incoming URL along with all the search params from the request.
if (mode !== 'url') {
incomingURL = siteCanonicalURL;
incomingURL.search = requestURL.search;
}
//
// Make sure the URL is clean of any va token after a successful lookup
// The token is stored in a cookie that is set on the redirect response
//
const incomingURL = mode === 'url' ? requestURL : siteCanonicalURL;
const requestURLWithoutToken = normalizeVisitorAuthURL(incomingURL);
if (
requestURLWithoutToken !== incomingURL &&
requestURLWithoutToken.toString() !== incomingURL.toString()
) {
const incomingURLWithoutToken = normalizeVisitorAuthURL(incomingURL);
if (incomingURLWithoutToken.toString() !== incomingURL.toString()) {
return writeResponseCookies(
NextResponse.redirect(requestURLWithoutToken.toString()),
NextResponse.redirect(incomingURLWithoutToken.toString()),
cookies
);
}