fix: redirect respects rewrites (#5315)

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

Author: schiller-manuel

examples/react/basic-ssr-file-based/src/entry-server.tsx

@@ -18,7 +18,7 @@ export async function render({
   res: express.Response
 }) {
   // Convert the express request to a fetch request
-  const url = new URL(req.originalUrl || req.url, 'https://localhost:3000').href
+  const url = new URL(req.originalUrl || req.url, 'http://localhost:3000').href
 
   const request = new Request(url, {
     method: req.method,

examples/react/basic-ssr-streaming-file-based/src/entry-server.tsx

@@ -18,7 +18,7 @@ export async function render({
   res: express.Response
 }) {
   // Convert the express request to a fetch request
-  const url = new URL(req.originalUrl || req.url, 'https://localhost:3000').href
+  const url = new URL(req.originalUrl || req.url, 'http://localhost:3000').href
 
   const request = new Request(url, {
     method: req.method,

packages/router-core/src/router.ts

@@ -2230,7 +2230,11 @@ export class RouterCore<
 
   resolveRedirect = (redirect: AnyRedirect): AnyRedirect => {
     if (!redirect.options.href) {
-      redirect.options.href = this.buildLocation(redirect.options).href
+      let href = this.buildLocation(redirect.options).url
+      if (this.origin && href.startsWith(this.origin)) {
+        href = href.replace(this.origin, '') || '/'
+      }
+      redirect.options.href = href
       redirect.headers.set('Location', redirect.options.href)
     }
 

packages/router-core/src/ssr/createRequestHandler.ts

@@ -1,6 +1,6 @@
 import { createMemoryHistory } from '@tanstack/history'
 import { mergeHeaders } from './headers'
-import { attachRouterServerSsrUtils } from './ssr-server'
+import { attachRouterServerSsrUtils, getOrigin } from './ssr-server'
 import type { HandlerCallback } from './handlerCallback'
 import type { AnyRouter } from '../router'
 import type { Manifest } from '../manifest'
@@ -27,7 +27,7 @@ export function createRequestHandler<TRouter extends AnyRouter>({
     })
 
     const url = new URL(request.url, 'http://localhost')
-
+    const origin = getOrigin(request)
     const href = url.href.replace(url.origin, '')
 
     // Create a history for the router
@@ -38,6 +38,7 @@ export function createRequestHandler<TRouter extends AnyRouter>({
     // Update the router with the history and context
     router.update({
       history,
+      origin: router.options.origin ?? origin,
     })
 
     await router.load()

packages/router-core/src/ssr/server.ts

@@ -7,7 +7,7 @@ export {
   transformStreamWithRouter,
   transformReadableStreamWithRouter,
 } from './transformStreamWithRouter'
-export { attachRouterServerSsrUtils } from './ssr-server'
+export { attachRouterServerSsrUtils, getOrigin } from './ssr-server'
 
 // declare module '../router' {
 //   export interface RegisterSsr {

packages/router-core/src/ssr/ssr-server.ts

@@ -141,3 +141,17 @@ export function attachRouterServerSsrUtils({
     },
   }
 }
+
+export function getOrigin(request: Request) {
+  const originHeader = request.headers.get('Origin')
+  if (originHeader) {
+    try {
+      new URL(originHeader)
+      return originHeader
+    } catch {}
+  }
+  try {
+    return new URL(request.url).origin
+  } catch {}
+  return 'http://localhost'
+}

packages/start-server-core/src/createStartHandler.ts

@@ -11,7 +11,10 @@ import {
   joinPaths,
   trimPath,
 } from '@tanstack/router-core'
-import { attachRouterServerSsrUtils } from '@tanstack/router-core/ssr/server'
+import {
+  attachRouterServerSsrUtils,
+  getOrigin,
+} from '@tanstack/router-core/ssr/server'
 import { runWithStartContext } from '@tanstack/start-storage-context'
 import { getResponseHeaders, requestHandler } from './request-response'
 import { getStartManifest } from './router-manifest'
@@ -94,19 +97,7 @@ export function createStartHandler<TRegister = Register>(
     request,
     requestOpts,
   ) => {
-    function getOrigin() {
-      const originHeader = request.headers.get('Origin')
-      if (originHeader) {
-        try {
-          new URL(originHeader)
-          return originHeader
-        } catch {}
-      }
-      try {
-        return new URL(request.url).origin
-      } catch {}
-      return 'http://localhost'
-    }
+    const origin = getOrigin(request)
 
     // Patching fetch function to use our request resolver
     // if the input starts with `/` which is a common pattern for
@@ -121,7 +112,7 @@ export function createStartHandler<TRegister = Register>(
 
       if (typeof input === 'string' && input.startsWith('/')) {
         // e.g: fetch('/api/data')
-        const url = new URL(input, getOrigin())
+        const url = new URL(input, origin)
         return resolve(url, init)
       } else if (
         typeof input === 'object' &&
@@ -130,7 +121,7 @@ export function createStartHandler<TRegister = Register>(
         input.url.startsWith('/')
       ) {
         // e.g: fetch(new Request('/api/data'))
-        const url = new URL(input.url, getOrigin())
+        const url = new URL(input.url, origin)
         return resolve(url, init)
       }
 
@@ -163,12 +154,11 @@ export function createStartHandler<TRegister = Register>(
         initialEntries: [href],
       })
 
-      const origin = router.options.origin ?? getOrigin()
       router.update({
         history,
         isShell,
         isPrerendering,
-        origin,
+        origin: router.options.origin ?? origin,
         ...{
           defaultSsr: startOptions.defaultSsr,
           serializationAdapters: startOptions.serializationAdapters,