Strip query params when resolving subpath

dani-garcia · Jul 5, 2024 · 5b67330 · 5b67330
1 parent 47e1f1c
commit 5b67330
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/patches/v2024.5.0.patch b/patches/v2024.5.0.patch
@@ -543,7 +543,7 @@ diff --git a/apps/web/src/app/platform/web-environment.service.ts b/apps/web/src
 index c2eb37eea5..2b5ac93392 100644
 --- a/apps/web/src/app/platform/web-environment.service.ts
 +++ b/apps/web/src/app/platform/web-environment.service.ts
-@@ -27,8 +27,17 @@ export class WebEnvironmentService extends DefaultEnvironmentService {
+@@ -27,8 +27,16 @@ export class WebEnvironmentService extends DefaultEnvironmentService {
      super(stateProvider, accountService);
 
      // The web vault always uses the current location as the base url
@@ -557,8 +557,7 @@ index c2eb37eea5..2b5ac93392 100644
 +    //
 +    // We want to get to just `https://vaultwarden.example.com/base/path`.
 +    let baseUrl = this.win.location.href;
-+    baseUrl = baseUrl.replace(/#.*/, ""); // Strip off `#` and everything after.
-+    baseUrl = baseUrl.replace(/\/+$/, ""); // Trim any trailing `/` chars.
++    baseUrl = baseUrl.replace(/(\/+|\/*#.*|\/*\?.*)$/, ""); // Strip off trailing `/`, `#`, `?` and everything after.
 +    const urls = { base: baseUrl };
 
      // Find the region