From 46581db16bc8ed4eda5f0198734146c4e82f9957 Mon Sep 17 00:00:00 2001
From: Alan Agius <alanagius@google.com>
Date: Wed, 29 Jan 2025 09:01:19 +0000
Subject: [PATCH] fix(@angular/ssr): redirect to locale pathname instead of
 full URL

When redirecting to the preferred locale, the previous implementation used the full URL for the 302 redirect to i18n subpaths based on the user's preferred locale. This update ensures that the redirect now uses the locale-specific pathname instead of the full URL.

Closes #29514
---
 packages/angular/ssr/src/app-engine.ts       | 8 +++-----
 packages/angular/ssr/test/app-engine_spec.ts | 4 ++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/packages/angular/ssr/src/app-engine.ts b/packages/angular/ssr/src/app-engine.ts
index d8df64fa4b..c1e2e7fcd5 100644
--- a/packages/angular/ssr/src/app-engine.ts
+++ b/packages/angular/ssr/src/app-engine.ts
@@ -97,8 +97,8 @@ export class AngularAppEngine {
     const { basePath, supportedLocales } = this.manifest;
 
     // If the request is not for the base path, it's not our responsibility to handle it.
-    const url = new URL(request.url);
-    if (url.pathname !== basePath) {
+    const { pathname } = new URL(request.url);
+    if (pathname !== basePath) {
       return null;
     }
 
@@ -112,12 +112,10 @@ export class AngularAppEngine {
     if (preferredLocale) {
       const subPath = supportedLocales[preferredLocale];
       if (subPath !== undefined) {
-        url.pathname = joinUrlParts(url.pathname, subPath);
-
         return new Response(null, {
           status: 302, // Use a 302 redirect as language preference may change.
           headers: {
-            'Location': url.toString(),
+            'Location': joinUrlParts(pathname, subPath),
             'Vary': 'Accept-Language',
           },
         });
diff --git a/packages/angular/ssr/test/app-engine_spec.ts b/packages/angular/ssr/test/app-engine_spec.ts
index 712c395397..b74244941c 100644
--- a/packages/angular/ssr/test/app-engine_spec.ts
+++ b/packages/angular/ssr/test/app-engine_spec.ts
@@ -157,12 +157,12 @@ describe('AngularAppEngine', () => {
       });
 
       it('should redirect to the highest priority locale when the URL is "/"', async () => {
-        const request = new Request('https://example.com/', {
+        const request = new Request('https://example.com', {
           headers: { 'Accept-Language': 'fr-CH, fr;q=0.9, it;q=0.8, en;q=0.7, *;q=0.5' },
         });
         const response = await appEngine.handle(request);
         expect(response?.status).toBe(302);
-        expect(response?.headers.get('Location')).toBe('https://example.com/it');
+        expect(response?.headers.get('Location')).toBe('/it');
         expect(response?.headers.get('Vary')).toBe('Accept-Language');
       });