fixup! fix(@angular/ssr): prevent redirect loop with encoded query parameters

Author: alan-agius4

packages/angular/ssr/src/utils/ng.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import { PlatformLocation } from '@angular/common';
+import { LocationStrategy } from '@angular/common';
 import {
   ApplicationRef,
   type PlatformRef,
@@ -21,9 +21,9 @@ import {
   platformServer,
   ɵrenderInternal as renderInternal,
 } from '@angular/platform-server';
-import { ActivatedRoute, Router } from '@angular/router';
+import { ActivatedRoute, Router, UrlSerializer } from '@angular/router';
 import { Console } from '../console';
-import { stripIndexHtmlFromURL, stripTrailingSlash } from './url';
+import { stripIndexHtmlFromURL } from './url';
 
 /**
  * Represents the bootstrap mechanism for an Angular application.
@@ -107,11 +107,14 @@ export async function renderAngular(
 
     if (!routerIsProvided) {
       hasNavigationError = false;
-    } else if (lastSuccessfulNavigation) {
+    } else if (lastSuccessfulNavigation?.finalUrl) {
       hasNavigationError = false;
-      const { pathname, search, hash } = envInjector.get(PlatformLocation);
-      const finalUrl = [stripTrailingSlash(pathname), search, hash].join('');
-      const finalUrlHref = decodeURIComponent(new URL(finalUrl, urlToRender.origin).href);
+
+      const urlSerializer = envInjector.get(UrlSerializer);
+      const finalUrlSerialized = urlSerializer.serialize(lastSuccessfulNavigation.finalUrl);
+      const locationStrategy = envInjector.get(LocationStrategy);
+      const finalUrl = locationStrategy.prepareExternalUrl(finalUrlSerialized);
+      const finalUrlHref = new URL(finalUrl, urlToRender.origin).href;
       const urlToRenderHref = decodeURIComponent(urlToRender.href);
 
       if (urlToRenderHref !== finalUrlHref) {

packages/angular/ssr/test/app-engine_spec.ts

@@ -270,11 +270,18 @@ describe('AngularAppEngine', () => {
       expect(await response?.text()).toContain('Home works');
     });
 
-    it('should not decode query parameters', async () => {
+    it('should work with encoded characters', async () => {
       const request = new Request('https://example.com/home?email=xyz%40xyz.com');
       const response = await appEngine.handle(request);
       expect(response?.status).toBe(200);
       expect(await response?.text()).toContain('Home works');
     });
+
+    it('should work with decoded characters', async () => {
+      const request = new Request('https://example.com/home?email=xyz@xyz.com');
+      const response = await appEngine.handle(request);
+      expect(response?.status).toBe(200);
+      expect(await response?.text()).toContain('Home works');
+    });
   });
 });