Skip to content

Commit

Permalink
Upgrade to v2024.5.1b
Browse files Browse the repository at this point in the history
  • Loading branch information
Timshel committed Jul 9, 2024
1 parent 1a60d70 commit 3f3180b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 20 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## v2024.5.1-3

- Upgrade to `v2024.5.1b`

## v2024.5.1-2

- Fix SSO redirection when using subpath
Expand Down
2 changes: 1 addition & 1 deletion build_versions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ TAG_CURRENT=$(git describe --tags HEAD)

# Commit to fetch
VAULT_VERSION=web-v2024.5.1
VW_VERSION=v2024.5.1
VW_VERSION=v2024.5.1b

# VaultWarden patch to apply
# PATCH_NAME="$VW_VERSION"
Expand Down
20 changes: 1 addition & 19 deletions oidc_subpath.patch
Original file line number Diff line number Diff line change
@@ -1,24 +1,7 @@
Subject: [PATCH] oidc subpath redirection

---
apps/web/src/app/platform/web-environment.service.ts | 3 +--
apps/web/src/connectors/sso.ts | 6 +++---
2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/apps/web/src/app/platform/web-environment.service.ts b/apps/web/src/app/platform/web-environment.service.ts
index 2b5ac93392..e801b8fe52 100644
--- a/apps/web/src/app/platform/web-environment.service.ts
+++ b/apps/web/src/app/platform/web-environment.service.ts
@@ -35,8 +35,7 @@ export class WebEnvironmentService extends DefaultEnvironmentService {
//
// 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
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/apps/web/src/connectors/sso.ts b/apps/web/src/connectors/sso.ts
index e049c64e5d..a9fb7edb07 100644
--- a/apps/web/src/connectors/sso.ts
Expand All @@ -42,4 +25,3 @@ index e049c64e5d..a9fb7edb07 100644
});
--
2.39.2

0 comments on commit 3f3180b

Please sign in to comment.