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

constantant · AndrewKushnir · commit 68ce4f6ab495 · 2023-01-12T11:45:32.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 #48489
diff --git a/packages/common/src/location/location.ts b/packages/common/src/location/location.ts
@@ -301,7 +301,9 @@ export function createLocation() {
 }
 
 function _stripBasePath(basePath: string, url: string): string {
-  return basePath && url.startsWith(basePath) ? url.substring(basePath.length) : url;
+  return basePath && new RegExp(`^${basePath}([/;?#]|$)`).test(url) ?
+      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,25 @@ describe('Location Class', () => {
       expect(location.normalize(url)).toBe(route);
     });
   });
+
+  describe('location.normalize(url) should return properly normalized url', () => {
+    it('in case url starts with the substring equals APP_BASE_HREF', () => {
+      const baseHref = '/en';
+      const path = '/enigma';
+      const queryParams = '?param1=123';
+      const matrixParams = ';param1=123';
+      const fragment = '#anchor1';
+
+      TestBed.configureTestingModule({providers: [{provide: APP_BASE_HREF, useValue: baseHref}]});
+
+      const location = TestBed.inject(Location);
+
+      expect(location.normalize(path)).toBe(path);
+      expect(location.normalize(baseHref)).toBe('');
+      expect(location.normalize(baseHref + path)).toBe(path);
+      expect(location.normalize(baseHref + queryParams)).toBe(queryParams);
+      expect(location.normalize(baseHref + matrixParams)).toBe(matrixParams);
+      expect(location.normalize(baseHref + fragment)).toBe(fragment);
+    });
+  });
 });

Original file line number	Diff line number	Diff line change
`@@ -301,7 +301,9 @@ 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`	+ return basePath && new RegExp(`^${basePath}([/;?#]\|$)`).test(url) ?
	`305`	`+ url.substring(basePath.length) :`
	`306`	`+ url;`
`305`	`307`	`}`
`306`	`308`
`307`	`309`	`function _stripIndexHtml(url: string): string {`