fixup! fix(@angular/ssr): resolve route parameters in redirect targets

Author: bschaeublin

packages/angular/ssr/src/routes/ng-routes.ts

@@ -203,17 +203,14 @@ async function* handleRoute(options: {
             `Please use one of the following redirect response codes: ${[...VALID_REDIRECT_RESPONSE_CODES.values()].join(', ')}.`,
         };
       } else if (typeof redirectTo === 'string') {
-        // Reference the route parameters by their position in the URL (see `buildPathWithParams`).
-        const routeSegments = joinUrlParts(baseHref, currentRoutePath).split('/');
         parentRoutes.set(metadata.route, {
           ...metadata,
-          redirectTo: resolveRedirectTo(
+          redirectTo: referenceRedirectParams(
+            route,
+            redirectTo,
             parentRoute,
-            replaceRedirectParams(
-              route,
-              redirectTo,
-              (parameter) => `*${routeSegments.lastIndexOf(parameter)}`,
-            ),
+            baseHref,
+            currentRoutePath,
           ),
           relativeRedirect: redirectTo[0] !== '/' ? true : undefined,
         });
@@ -468,15 +465,12 @@ async function* handleSSGRoute(
 
   const redirectTo = typeof route.redirectTo === 'string' ? route.redirectTo : undefined;
   if (redirectTo !== undefined) {
-    // Reference the route parameters by their position in the URL (see `buildPathWithParams`).
-    const routeSegments = joinUrlParts(baseHref, currentRoutePath).split('/');
-    meta.redirectTo = resolveRedirectTo(
+    meta.redirectTo = referenceRedirectParams(
+      route,
+      redirectTo,
       parentRoute,
-      replaceRedirectParams(
-        route,
-        redirectTo,
-        (parameter) => `*${routeSegments.lastIndexOf(parameter)}`,
-      ),
+      baseHref,
+      currentRoutePath,
     );
     meta.relativeRedirect = redirectTo[0] !== '/' ? true : undefined;
   }
@@ -660,6 +654,36 @@ function replaceRedirectParams(
   return resolvedPath + redirectTo.slice(path.length);
 }
 
+/**
+ * Resolves the `redirectTo` property of a route (see `resolveRedirectTo`), and references the
+ * route parameters, such as `:id`, by their position in the URL (see `buildPathWithParams`).
+ *
+ * @param route - The redirecting route.
+ * @param redirectTo - The target path for redirection.
+ * @param parentRoute - The path of the parent route.
+ * @param baseHref - The base href of the application.
+ * @param currentRoutePath - The path of the redirecting route.
+ * @returns The resolved redirect path with the route parameters referenced by position.
+ */
+function referenceRedirectParams(
+  route: Route,
+  redirectTo: string,
+  parentRoute: string,
+  baseHref: string,
+  currentRoutePath: string,
+): string {
+  const routeSegments = joinUrlParts(baseHref, currentRoutePath).split('/');
+
+  return resolveRedirectTo(
+    parentRoute,
+    replaceRedirectParams(
+      route,
+      redirectTo,
+      (parameter) => `*${routeSegments.lastIndexOf(parameter)}`,
+    ),
+  );
+}
+
 /**
  * Builds a server configuration route tree from the given server routes configuration.
  *