fix(common): Update Location to get a normalized URL valid in case a represented URL starts with the substring equals APP_BASE_HREF (#48394)

constantant · thePunderWoman · commit 59c6bfb6324c · 2022-12-12T09:37:36.000-08:00
```ts @NgModule({ imports: [RouterModule.forRoot([{path: '/enigma', component: EnigmaComponent}])], providers: [{provide: APP_BASE_HREF, useValue: '/en'}] }) export class AppModule {} ``` Navigating to `/enigma` will redirect to `/en/igma` not to `/en/enigma` as it expects Fixes: #45744 PR Close #48394
diff --git a/packages/common/src/location/location.ts b/packages/common/src/location/location.ts
@@ -301,7 +301,10 @@ export function createLocation() {
 }
 
 function _stripBasePath(basePath: string, url: string): string {
-  return basePath && url.startsWith(basePath) ? url.substring(basePath.length) : url;
+  if (basePath === url) {
+    return '';
+  }
+  return basePath && url.startsWith(basePath + '/') ? url.substring(basePath.length) : url;
 }
 
 function _stripIndexHtml(url: string): string {
diff --git a/packages/common/test/location/location_spec.ts b/packages/common/test/location/location_spec.ts
@@ -266,4 +266,18 @@ describe('Location Class', () => {
       expect(location.normalize(url)).toBe(route);
     });
   });
+
+  describe('location.normalize(url) should return correct route', () => {
+    it('in case url starts with the substring equals APP_BASE_HREF', () => {
+      const baseHref = '/en';
+      const url = '/enigma';
+
+      TestBed.configureTestingModule({providers: [{provide: APP_BASE_HREF, useValue: baseHref}]});
+
+      const location = TestBed.inject(Location);
+
+      expect(location.normalize(url)).toBe(url);
+      expect(location.normalize(baseHref + url)).toBe(url);
+    });
+  });
 });

Original file line number	Diff line number	Diff line change
`@@ -301,7 +301,10 @@ export function createLocation() {`
`301`	`301`	`}`
`302`	`302`
`303`	`303`	`function _stripBasePath(basePath: string, url: string): string {`
`304`		`- return basePath && url.startsWith(basePath) ? url.substring(basePath.length) : url;`
	`304`	`+ if (basePath === url) {`
	`305`	`+ return '';`
	`306`	`+ }`
	`307`	`+ return basePath && url.startsWith(basePath + '/') ? url.substring(basePath.length) : url;`
`305`	`308`	`}`
`306`	`309`
`307`	`310`	`function _stripIndexHtml(url: string): string {`