From 988da062ba385d87387cb5a8bc494e1a9357378a Mon Sep 17 00:00:00 2001
From: Annika Nowak <annika.nowak@capgemini.com>
Date: Thu, 8 Aug 2024 13:27:31 +0200
Subject: [PATCH] fix: adapt the url to ensure a correct redirect between the
 apps

---
 .../lib/utils/webcomponent-router.utils.ts    | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/libs/angular-webcomponents/src/lib/utils/webcomponent-router.utils.ts b/libs/angular-webcomponents/src/lib/utils/webcomponent-router.utils.ts
index 618dd209..79db6abf 100644
--- a/libs/angular-webcomponents/src/lib/utils/webcomponent-router.utils.ts
+++ b/libs/angular-webcomponents/src/lib/utils/webcomponent-router.utils.ts
@@ -1,25 +1,33 @@
 import { Route, UrlMatcher, UrlSegment, UrlSegmentGroup } from '@angular/router'
 
 export function startsWith(prefix: string): UrlMatcher {
-  return (url: UrlSegment[], UrlSegmentGroup: UrlSegmentGroup, route: Route) => {
-    const urlWithoutBaseHref = sliceBaseHref(route, url)
+  return (url: UrlSegment[], _urlSegmentGroup: UrlSegmentGroup, route: Route) => {
+    const baseHref = getBaseHrefOfRoute(route)
+    if (`/${url.map((s) => s.path).join('/')}/`.startsWith(baseHref)) {
+      const urlWithoutBaseHref = sliceBaseHref(route, url)
 
-    const fullUrl = urlWithoutBaseHref.map((u) => u.path).join('/')
-    if (fullUrl.startsWith(prefix)) {
-      const prefixLength = prefix.split('/').filter((value) => value).length
-      return { consumed: url.slice(0, baseHrefSegmentAmount(url, urlWithoutBaseHref) + prefixLength) }
+      const fullUrl = urlWithoutBaseHref.map((u) => u.path).join('/')
+      if (fullUrl.startsWith(prefix)) {
+        const prefixLength = prefix.split('/').filter((value) => value).length
+        return { consumed: url.slice(0, baseHrefSegmentAmount(url, urlWithoutBaseHref) + prefixLength) }
+      }
     }
     return null
   }
 }
 
-export function sliceBaseHref(route: Route, url: UrlSegment[]): UrlSegment[] {
+export function getBaseHrefOfRoute(route: Route): string {
   const mfeBaseHref: string = route?.data?.['mfeInfo']?.baseHref
   if (!mfeBaseHref) {
     console.warn(
       'mfeInfo was not provided for route. initializeRouter function is required to be registered as app initializer.'
     )
   }
+  return mfeBaseHref
+}
+
+export function sliceBaseHref(route: Route, url: UrlSegment[]): UrlSegment[] {
+  const mfeBaseHref = getBaseHrefOfRoute(route)
 
   const baseHrefSegmentAmount = mfeBaseHref.split('/').filter((value) => value).length
   return url.slice(baseHrefSegmentAmount)