Fix absolute redirect detection (#9689)

* Fix absolute redirect detection * Use createClientSideUrl * inline origin * Add changeset
remix-run · Dec 6, 2022 · bd58142 · bd58142
1 parent 51e65db
commit bd58142
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/.changeset/swift-lemons-cough.md b/.changeset/swift-lemons-cough.md
@@ -0,0 +1,5 @@
+---
+"@remix-run/router": patch
+---
+
+Fix URL creation in Remix integration tests
diff --git a/packages/router/router.ts b/packages/router/router.ts
@@ -1606,17 +1606,17 @@ export function createRouter(init: RouterInit): Router {
       "Expected a location on the redirect navigation"
     );
 
-    if (
-      redirect.external &&
-      typeof window !== "undefined" &&
-      typeof window.location !== "undefined"
-    ) {
-      if (replace) {
-        window.location.replace(redirect.location);
-      } else {
-        window.location.assign(redirect.location);
+    // Check if this an external redirect that goes to a new origin
+    if (typeof window?.location !== "undefined") {
+      let newOrigin = createClientSideURL(redirect.location).origin;
+      if (window.location.origin !== newOrigin) {
+        if (replace) {
+          window.location.replace(redirect.location);
+        } else {
+          window.location.assign(redirect.location);
+        }
+        return;
       }
-      return;
     }
 
     // There's no need to abort on redirects, since we don't detect the
@@ -2627,22 +2627,19 @@ async function callLoaderOrAction(
         "Redirects returned/thrown from loaders/actions must have a Location header"
       );
 
-      // Check if this an external redirect that goes to a new origin
-      let currentUrl = new URL(request.url);
-      let currentOrigin = currentUrl.origin;
-      let newOrigin = new URL(location, currentOrigin).origin;
-      let external = newOrigin !== currentOrigin;
+      let isAbsolute =
+        /^[a-z+]+:\/\//i.test(location) || location.startsWith("//");
 
       // Support relative routing in internal redirects
-      if (!external) {
+      if (!isAbsolute) {
         let activeMatches = matches.slice(0, matches.indexOf(match) + 1);
         let routePathnames = getPathContributingMatches(activeMatches).map(
           (match) => match.pathnameBase
         );
         let resolvedLocation = resolveTo(
           location,
           routePathnames,
-          currentUrl.pathname
+          new URL(request.url).pathname
         );
         invariant(
           createPath(resolvedLocation),
@@ -2673,7 +2670,6 @@ async function callLoaderOrAction(
         status,
         location,
         revalidate: result.headers.get("X-Remix-Revalidate") !== null,
-        external,
       };
     }
 

diff --git a/packages/router/utils.ts b/packages/router/utils.ts
@@ -41,7 +41,6 @@ export interface RedirectResult {
   status: number;
   location: string;
   revalidate: boolean;
-  external: boolean;
 }
 
 /**