From fe5f01bb1763f88c997ee1ddfe4d98921807a728 Mon Sep 17 00:00:00 2001
From: Alan Agius <17563226+alan-agius4@users.noreply.github.com>
Date: Fri, 17 Oct 2025 14:40:47 +0000
Subject: [PATCH] refactor(@angular/ssr): simplify redirect URL determination

The logic to determine the final URL for server-side rendering redirects is simplified. Previously, it used LocationStrategy and UrlSerializer to construct the final URL. This is replaced by using PlatformLocation to directly get the pathname, search, and hash.

This change removes unnecessary complexity and dependencies, making the code easier to understand and maintain.
---
 packages/angular/ssr/src/utils/ng.ts | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/packages/angular/ssr/src/utils/ng.ts b/packages/angular/ssr/src/utils/ng.ts
index 0b3f4b12c40a..120fdf940dd6 100644
--- a/packages/angular/ssr/src/utils/ng.ts
+++ b/packages/angular/ssr/src/utils/ng.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import { LocationStrategy } from '@angular/common';
+import { PlatformLocation } from '@angular/common';
 import {
   ApplicationRef,
   type PlatformRef,
@@ -21,9 +21,9 @@ import {
   platformServer,
   ɵrenderInternal as renderInternal,
 } from '@angular/platform-server';
-import { ActivatedRoute, Router, UrlSerializer } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { Console } from '../console';
-import { joinUrlParts, stripIndexHtmlFromURL } from './url';
+import { stripIndexHtmlFromURL, stripTrailingSlash } from './url';
 
 /**
  * Represents the bootstrap mechanism for an Angular application.
@@ -107,16 +107,13 @@ export async function renderAngular(
 
     if (!routerIsProvided) {
       hasNavigationError = false;
-    } else if (lastSuccessfulNavigation?.finalUrl) {
+    } else if (lastSuccessfulNavigation) {
       hasNavigationError = false;
+      const { pathname, search, hash } = envInjector.get(PlatformLocation);
+      const finalUrl = [stripTrailingSlash(pathname), search, hash].join('');
 
-      const urlSerializer = envInjector.get(UrlSerializer);
-      const locationStrategy = envInjector.get(LocationStrategy);
-      const finalUrlSerialized = urlSerializer.serialize(lastSuccessfulNavigation.finalUrl);
-      const finalExternalUrl = joinUrlParts(locationStrategy.getBaseHref(), finalUrlSerialized);
-
-      if (urlToRender.href !== new URL(finalExternalUrl, urlToRender.origin).href) {
-        redirectTo = finalExternalUrl;
+      if (urlToRender.href !== new URL(finalUrl, urlToRender.origin).href) {
+        redirectTo = finalUrl;
       }
     }