Fix image resizing in v2 when url is being passed as x-gitbook-url (#…

…2921)
GitbookIO · Mar 4, 2025 · 821899a · 821899a
1 parent bfcc119
commit 821899a
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/packages/gitbook-v2/src/middleware.ts b/packages/gitbook-v2/src/middleware.ts
@@ -16,21 +16,21 @@ type URLWithMode = { url: URL; mode: 'url' | 'url-host' };
 
 export async function middleware(request: NextRequest) {
     try {
-        /**
-         * Serve image resizing requests (all requests containing `/~gitbook/image`).
-         * All URLs containing `/~gitbook/image` are rewritten to `/~gitbook/image`
-         * and serve from a single route handler.
-         *
-         * In GitBook v1: image resizing was done at the root of the hostname (docs.company.com/~gitbook/image)
-         * In GitBook v2: image resizing is done at the content level (docs.company.com/section/variant/~gitbook/image)
-         */
-        if (request.nextUrl.pathname.endsWith('/~gitbook/image')) {
-            return serveResizedImage(request);
-        }
-
         // Route all requests to a site
         const extracted = extractURL(request);
         if (extracted) {
+            /**
+             * Serve image resizing requests (all requests containing `/~gitbook/image`).
+             * All URLs containing `/~gitbook/image` are rewritten to `/~gitbook/image`
+             * and serve from a single route handler.
+             *
+             * In GitBook v1: image resizing was done at the root of the hostname (docs.company.com/~gitbook/image)
+             * In GitBook v2: image resizing is done at the content level (docs.company.com/section/variant/~gitbook/image)
+             */
+            if (extracted.url.pathname.endsWith('/~gitbook/image')) {
+                return serveResizedImage(request);
+            }
+
             return serveSiteByURL(request, extracted);
         }