From 6450b1d7a3cfd3093ab666a700909af063aa6a56 Mon Sep 17 00:00:00 2001
From: Alan Agius <alanagius@google.com>
Date: Fri, 8 Nov 2024 16:13:22 +0000
Subject: [PATCH] fix(@angular/build): add missing redirect in SSR manifest

Corrected an issue where a redirect was not properly included in the SSR (Server-Side Rendering) manifest. This fix ensures that all necessary redirects are accounted for during the build process.
---
 .../application/execute-post-bundle.ts        | 19 ++-----------
 packages/angular/ssr/src/app.ts               | 28 +++++++++----------
 .../server-routes-output-mode-server.ts       |  7 +++++
 3 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/packages/angular/build/src/builders/application/execute-post-bundle.ts b/packages/angular/build/src/builders/application/execute-post-bundle.ts
index 4430174757a7..2f4f73c69b08 100644
--- a/packages/angular/build/src/builders/application/execute-post-bundle.ts
+++ b/packages/angular/build/src/builders/application/execute-post-bundle.ts
@@ -176,23 +176,10 @@ export async function executePostBundleSteps(
     const serializableRouteTreeNodeForManifest: WritableSerializableRouteTreeNode = [];
 
     for (const metadata of serializableRouteTreeNode) {
-      switch (metadata.renderMode) {
-        case RouteRenderMode.Prerender:
-        case /* Legacy building mode */ undefined: {
-          if (!metadata.redirectTo) {
-            serializableRouteTreeNodeForManifest.push(metadata);
+      serializableRouteTreeNodeForManifest.push(metadata);
 
-            if (!metadata.route.includes('*')) {
-              prerenderedRoutes[metadata.route] = { headers: metadata.headers };
-            }
-          }
-          break;
-        }
-        case RouteRenderMode.Server:
-        case RouteRenderMode.Client:
-          serializableRouteTreeNodeForManifest.push(metadata);
-
-          break;
+      if (metadata.renderMode === RouteRenderMode.Prerender && !metadata.route.includes('*')) {
+        prerenderedRoutes[metadata.route] = { headers: metadata.headers };
       }
     }
 
diff --git a/packages/angular/ssr/src/app.ts b/packages/angular/ssr/src/app.ts
index d4a21c088cec..5c77e33d72d0 100644
--- a/packages/angular/ssr/src/app.ts
+++ b/packages/angular/ssr/src/app.ts
@@ -154,7 +154,16 @@ export class AngularServerApp {
       return null;
     }
 
-    if (matchedRoute.renderMode === RenderMode.Prerender) {
+    const { redirectTo, status, renderMode } = matchedRoute;
+    if (redirectTo !== undefined) {
+      // Note: The status code is validated during route extraction.
+      // 302 Found is used by default for redirections
+      // See: https://developer.mozilla.org/en-US/docs/Web/API/Response/redirect_static#status
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      return Response.redirect(new URL(redirectTo, new URL(request.url)), (status as any) ?? 302);
+    }
+
+    if (renderMode === RenderMode.Prerender) {
       const response = await this.handleServe(request, matchedRoute);
       if (response) {
         return response;
@@ -186,7 +195,7 @@ export class AngularServerApp {
       return null;
     }
 
-    const { url, method } = request;
+    const { method } = request;
     if (method !== 'GET' && method !== 'HEAD') {
       return null;
     }
@@ -228,18 +237,7 @@ export class AngularServerApp {
     matchedRoute: RouteTreeNodeMetadata,
     requestContext?: unknown,
   ): Promise<Response | null> {
-    const { redirectTo, status } = matchedRoute;
-    const url = new URL(request.url);
-
-    if (redirectTo !== undefined) {
-      // Note: The status code is validated during route extraction.
-      // 302 Found is used by default for redirections
-      // See: https://developer.mozilla.org/en-US/docs/Web/API/Response/redirect_static#status
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      return Response.redirect(new URL(redirectTo, url), (status as any) ?? 302);
-    }
-
-    const { renderMode, headers } = matchedRoute;
+    const { renderMode, headers, status } = matchedRoute;
     if (
       !this.allowStaticRouteRender &&
       (renderMode === RenderMode.Prerender || renderMode === RenderMode.AppShell)
@@ -292,7 +290,9 @@ export class AngularServerApp {
       });
     }
 
+    const url = new URL(request.url);
     let html = await assets.getIndexServerHtml().text();
+
     // Skip extra microtask if there are no pre hooks.
     if (hooks.has('html:transform:pre')) {
       html = await hooks.run('html:transform:pre', { html, url });
diff --git a/tests/legacy-cli/e2e/tests/build/server-rendering/server-routes-output-mode-server.ts b/tests/legacy-cli/e2e/tests/build/server-rendering/server-routes-output-mode-server.ts
index 939ba74db9de..9d552d9b8de3 100644
--- a/tests/legacy-cli/e2e/tests/build/server-rendering/server-routes-output-mode-server.ts
+++ b/tests/legacy-cli/e2e/tests/build/server-rendering/server-routes-output-mode-server.ts
@@ -160,6 +160,13 @@ export default async function () {
         'x-custom': 'csr',
       },
     },
+    '/redirect': {
+      content: 'ssg works!',
+      serverContext: 'ng-server-context="ssg"',
+      headers: {
+        'x-custom': 'ssg',
+      },
+    },
   };
 
   const port = await spawnServer();