Revert "feat: add ctx.redirect() helper (#2358)"

src/server/context.ts

@@ -114,31 +114,6 @@ export async function getServerContext(state: InternalFreshState) {
   );
 }
 
-function redirectTo(pathOrUrl: string = "/", status = 302): Response {
-  let location = pathOrUrl;
-
-  // Disallow protocol relative URLs
-  if (pathOrUrl !== "/" && pathOrUrl.startsWith("/")) {
-    let idx = pathOrUrl.indexOf("?");
-    if (idx === -1) {
-      idx = pathOrUrl.indexOf("#");
-    }
-
-    const pathname = idx > -1 ? pathOrUrl.slice(0, idx) : pathOrUrl;
-    const search = idx > -1 ? pathOrUrl.slice(idx) : "";
-
-    // Remove double slashes to prevent open redirect vulnerability.
-    location = `${pathname.replaceAll(/\/+/g, "/")}${search}`;
-  }
-
-  return new Response(null, {
-    status,
-    headers: {
-      location,
-    },
-  });
-}
-
 export class ServerContext {
   #renderFn: RenderFunction;
   #plugins: Plugin[];
@@ -308,7 +283,6 @@ export class ServerContext {
           ctx.data = data;
           return await renderNotFound(req, ctx);
         },
-        redirect: redirectTo,
         route: "",
         get pattern() {
           return ctx.route;
@@ -635,7 +609,12 @@ export class ServerContext {
       if (key !== null && BUILD_ID !== key) {
         url.searchParams.delete(ASSET_CACHE_BUST_KEY);
         const location = url.pathname + url.search;
-        return redirectTo(location, 307);
+        return new Response(null, {
+          status: 307,
+          headers: {
+            location,
+          },
+        });
       }
       const headers = new Headers({
         "content-type": contentType,

src/server/types.ts

@@ -157,7 +157,7 @@ export type PageProps<T = any, S = Record<string, unknown>> = Omit<
     S,
     T
   >,
-  "render" | "next" | "renderNotFound" | "redirect"
+  "render" | "next" | "renderNotFound"
 >;
 
 export interface StaticFile {
@@ -206,7 +206,6 @@ export interface FreshContext<
   ) => Response | Promise<Response>;
   Component: ComponentType<unknown>;
   next: () => Promise<Response>;
-  redirect: (path: string, statusCode?: number) => Response;
 }
 /**
  * Context passed to async route components.

tests/fixture/fresh.gen.ts

@@ -65,7 +65,6 @@ import * as $not_found from "./routes/not_found.ts";
 import * as $params from "./routes/params.tsx";
 import * as $preact_boolean_attrs from "./routes/preact/boolean_attrs.tsx";
 import * as $props_id_ from "./routes/props/[id].tsx";
-import * as $redirect from "./routes/redirect.tsx";
 import * as $route_groups_islands_index from "./routes/route-groups-islands/index.tsx";
 import * as $route_groups_bar_baz_layout from "./routes/route-groups/(bar)/(baz)/_layout.tsx";
 import * as $route_groups_bar_baz_baz from "./routes/route-groups/(bar)/(baz)/baz.tsx";
@@ -187,7 +186,6 @@ const manifest = {
     "./routes/params.tsx": $params,
     "./routes/preact/boolean_attrs.tsx": $preact_boolean_attrs,
     "./routes/props/[id].tsx": $props_id_,
-    "./routes/redirect.tsx": $redirect,
     "./routes/route-groups-islands/index.tsx": $route_groups_islands_index,
     "./routes/route-groups/(bar)/(baz)/_layout.tsx":
       $route_groups_bar_baz_layout,

tests/fixture_base_path/routes/api/rewrite.ts

@@ -1,7 +1,13 @@
 import { Handlers } from "$fresh/server.ts";
 
 export const handler: Handlers<unknown, { data: string }> = {
-  GET(_req, ctx) {
-    return ctx.redirect(ctx.url.origin, 302);
+  GET(req) {
+    const url = new URL(req.url);
+    return new Response(null, {
+      status: 302,
+      headers: {
+        "Location": url.origin,
+      },
+    });
   },
 };

tests/main_test.ts

@@ -273,42 +273,6 @@ Deno.test("no open redirect when passing double slashes", async () => {
   assertEquals(resp.headers.get("location"), "/evil.com");
 });
 
-Deno.test("ctx.redirect() - relative urls", async () => {
-  let resp = await handler(
-    new Request("https://fresh.deno.dev/redirect?path=//evil.com/"),
-  );
-  assertEquals(resp.status, 302);
-  assertEquals(resp.headers.get("location"), "/evil.com/");
-
-  resp = await handler(
-    new Request(
-      "https://fresh.deno.dev/redirect?path=//evil.com//foo&status=307",
-    ),
-  );
-  assertEquals(resp.status, 307);
-  assertEquals(resp.headers.get("location"), "/evil.com/foo");
-});
-
-Deno.test("ctx.redirect() - absolute urls", async () => {
-  const resp = await handler(
-    new Request("https://fresh.deno.dev/redirect?path=https://example.com/"),
-  );
-  assertEquals(resp.status, 302);
-  assertEquals(resp.headers.get("location"), "https://example.com/");
-});
-
-Deno.test("ctx.redirect() - with search and hash", async () => {
-  const resp = await handler(
-    new Request(
-      `https://fresh.deno.dev/redirect?path=${
-        encodeURIComponent("/foo/bar?baz=123#foo")
-      }`,
-    ),
-  );
-  assertEquals(resp.status, 302);
-  assertEquals(resp.headers.get("location"), "/foo/bar?baz=123#foo");
-});
-
 Deno.test("/failure", async () => {
   const resp = await handler(new Request("https://fresh.deno.dev/failure"));
   assert(resp);
@@ -1205,7 +1169,6 @@ Deno.test("Expose config in ctx", async () => {
       next: "Function",
       render: "AsyncFunction",
       renderNotFound: "AsyncFunction",
-      redirect: "Function",
       localAddr: "<undefined>",
       pattern: "/ctx_config",
       data: "<undefined>",

tests/server_components_test.ts

@@ -117,7 +117,6 @@ Deno.test("passes context to server component", async () => {
           params: {
             id: "foo",
           },
-          redirect: "Function",
           state: {},
           isPartial: false,
         },

www/routes/docs/_middleware.ts

@@ -12,7 +12,11 @@ export async function handler(
   // Redirect from old doc URLs to new ones
   const redirect = REDIRECTS[ctx.url.pathname];
   if (redirect) {
-    return ctx.redirect(redirect, 307);
+    const url = new URL(redirect, ctx.url.origin);
+    return new Response("", {
+      status: 307,
+      headers: { location: url.href },
+    });
   }
 
   return await ctx.next();