mirrors/vaultwarden-web
1
0
Fork 0
mirror of https://github.com/dani-garcia/bw_web_builds.git synced 2025-01-12 20:57:18 +03:00
Code Issues Projects Releases Packages Wiki Activity

Strip query params when resolving subpath

Browse source
This commit is contained in:
Timshel 2024-07-05 18:20:12 +02:00
parent 47e1f1c668
commit ee6792405b
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
patches/v2024.5.0.patch
View file

@ -554,13 +554,13 @@ index c2eb37eea5..2b5ac93392 100644
+ // + //
+ // - `https://vaultwarden.example.com/base/path/` + // - `https://vaultwarden.example.com/base/path/`
+ // - `https://vaultwarden.example.com/base/path/#/some/route[?queryParam=...]` + // - `https://vaultwarden.example.com/base/path/#/some/route[?queryParam=...]`
+ // - `https://vaultwarden.example.com/base/path/?queryParam=...`
+ // + //
+ // We want to get to just `https://vaultwarden.example.com/base/path`. + // We want to get to just `https://vaultwarden.example.com/base/path`.
+ let baseUrl = this.win.location.href; + let baseUrl = this.win.location.href;
+ baseUrl = baseUrl.replace(/#.*/, ""); // Strip off `#` and everything after. + baseUrl = baseUrl.replace(/(\/+|\/*#.*|\/*\?.*)$/, ""); // Strip off trailing `/`, `#`, `?` and everything after.
+ baseUrl = baseUrl.replace(/\/+$/, ""); // Trim any trailing `/` chars.
+ const urls = { base: baseUrl }; + const urls = { base: baseUrl };
// Find the region // Find the region
const domain = Utils.getDomain(this.win.location.href); const domain = Utils.getDomain(this.win.location.href);
diff --git a/apps/web/src/app/shared/loose-components.module.ts b/apps/web/src/app/shared/loose-components.module.ts diff --git a/apps/web/src/app/shared/loose-components.module.ts b/apps/web/src/app/shared/loose-components.module.ts