[PR #5798] [MERGED] Sync with Upstream #7304

New Issue

GiteaMirror · 2026-03-07T21:14:42-06:00

GiteaMirror commented

2026-03-07 21:14:42 -06:00

📋 Pull Request Information

Original PR: https://github.com/dani-garcia/vaultwarden/pull/5798
Author: @BlackDex
Created: 4/23/2025
Status: ✅ Merged
Merged: 5/26/2025
Merged by: @dani-garcia

Base: main ← Head: sync-upstream

📝 Commits (10+)

bdb46fe WIP Sync with Upstream
42b5964 More API Response fixes
13cb71f Add avatar color to emergency access api
91d357b Fix spelling and some crate updates
82a3e2e Use PushId and always generate the PushId
1eb6cd1 Fix clippy lints
8d73aac Fix several Push issues and API's
88753c2 Check if push_uuid is empty and generate when needed
db7ca75 Updated some comments and removed old export format
0d2961f cargo update

📊 Changes

37 files changed (+632 additions, -367 deletions)

View changed files

📝 .env.template (+4 -8)
📝 Cargo.lock (+37 -42)
📝 Cargo.toml (+2 -2)
📝 src/api/admin.rs (+3 -3)
📝 src/api/core/accounts.rs (+33 -27)
📝 src/api/core/ciphers.rs (+12 -12)
📝 src/api/core/events.rs (+3 -3)
📝 src/api/core/folders.rs (+3 -3)
📝 src/api/core/mod.rs (+14 -6)
📝 src/api/core/organizations.rs (+132 -34)
📝 src/api/core/public.rs (+1 -1)
📝 src/api/core/sends.rs (+28 -10)
📝 src/api/core/two_factor/authenticator.rs (+4 -0)
📝 src/api/core/two_factor/duo.rs (+3 -0)
📝 src/api/core/two_factor/duo_oidc.rs (+1 -1)
📝 src/api/identity.rs (+7 -6)
📝 src/api/notifications.rs (+19 -25)
📝 src/api/push.rs (+123 -107)
📝 src/auth.rs (+22 -13)
📝 src/config.rs (+15 -10)

...and 17 more files

📄 Description

Synced the API responses of Vaultwarden to match more closely the current Bitwarden version (Mainly v2025.4.x and some v2025.5.x). This solved several issues which are currently open, but also some outstanding tasks.

Updated several Bitwarden source links to current versions
Prevent deprecated experimental client feature flags from being returned, but also from causing errors during starting.
Fixed several issues with the Push Notifications and Android client registrations (And possibly also iOS)
Added or removed several response key/values to match Bitwarden
Send an email if someone tries to change their email address to an address which already has an account (Fixes #5630)
Added a Small error-kind which is needed for the org-import to show the correct error message
Allow members with can manage access to a collection to import personal/non-collection backups/exports into the allowed collection. Fixes #5592
Added remove collection functionality with Bulk Collection Editing. Fixes #5737

By fixing several responses like which users are a member of a collection or group some issues seem to have been resolved since I'm unable to reproduce them anymore. This is either thanks to those changes or some web-vault updates or both.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/dani-garcia/vaultwarden/pull/5798 **Author:** [@BlackDex](https://github.com/BlackDex) **Created:** 4/23/2025 **Status:** ✅ Merged **Merged:** 5/26/2025 **Merged by:** [@dani-garcia](https://github.com/dani-garcia) **Base:** `main` ← **Head:** `sync-upstream` --- ### 📝 Commits (10+) - [`bdb46fe`](https://github.com/dani-garcia/vaultwarden/commit/bdb46fee2d7aa4500a240d8d70bbcb8a9f0df42e) WIP Sync with Upstream - [`42b5964`](https://github.com/dani-garcia/vaultwarden/commit/42b596479025de8882c12948ee0e0deb13358969) More API Response fixes - [`13cb71f`](https://github.com/dani-garcia/vaultwarden/commit/13cb71f03bb55f6ddc9528ade80628f8f777a867) Add avatar color to emergency access api - [`91d357b`](https://github.com/dani-garcia/vaultwarden/commit/91d357b23bae21ca622727aaf53114383b89d63c) Fix spelling and some crate updates - [`82a3e2e`](https://github.com/dani-garcia/vaultwarden/commit/82a3e2eb7c72cd7844e7ef98c76f367ba7bd3e53) Use PushId and always generate the PushId - [`1eb6cd1`](https://github.com/dani-garcia/vaultwarden/commit/1eb6cd1afaf4e788f40fd3f58ba3db2b53987e95) Fix clippy lints - [`8d73aac`](https://github.com/dani-garcia/vaultwarden/commit/8d73aace2084e2b67b233409b6f548e8155ea570) Fix several Push issues and API's - [`88753c2`](https://github.com/dani-garcia/vaultwarden/commit/88753c201dcfc314a5bf6d9dfc2b88a4271527a9) Check if push_uuid is empty and generate when needed - [`db7ca75`](https://github.com/dani-garcia/vaultwarden/commit/db7ca753803f14da756030570872dbc1b476476d) Updated some comments and removed old export format - [`0d2961f`](https://github.com/dani-garcia/vaultwarden/commit/0d2961f5f51ebb5ba9b56dfd81cb6e9bcc9dcff9) cargo update ### 📊 Changes **37 files changed** (+632 additions, -367 deletions) <details> <summary>View changed files</summary> 📝 `.env.template` (+4 -8) 📝 `Cargo.lock` (+37 -42) 📝 `Cargo.toml` (+2 -2) 📝 `src/api/admin.rs` (+3 -3) 📝 `src/api/core/accounts.rs` (+33 -27) 📝 `src/api/core/ciphers.rs` (+12 -12) 📝 `src/api/core/events.rs` (+3 -3) 📝 `src/api/core/folders.rs` (+3 -3) 📝 `src/api/core/mod.rs` (+14 -6) 📝 `src/api/core/organizations.rs` (+132 -34) 📝 `src/api/core/public.rs` (+1 -1) 📝 `src/api/core/sends.rs` (+28 -10) 📝 `src/api/core/two_factor/authenticator.rs` (+4 -0) 📝 `src/api/core/two_factor/duo.rs` (+3 -0) 📝 `src/api/core/two_factor/duo_oidc.rs` (+1 -1) 📝 `src/api/identity.rs` (+7 -6) 📝 `src/api/notifications.rs` (+19 -25) 📝 `src/api/push.rs` (+123 -107) 📝 `src/auth.rs` (+22 -13) 📝 `src/config.rs` (+15 -10) _...and 17 more files_ </details> ### 📄 Description Synced the API responses of Vaultwarden to match more closely the current Bitwarden version (Mainly v2025.4.x and some v2025.5.x). This solved several issues which are currently open, but also some outstanding tasks. - Updated several Bitwarden source links to current versions - Prevent deprecated experimental client feature flags from being returned, but also from causing errors during starting. - Fixed several issues with the Push Notifications and Android client registrations (And possibly also iOS) - Added or removed several response key/values to match Bitwarden - Send an email if someone tries to change their email address to an address which already has an account (Fixes #5630) - Added a `Small` error-kind which is needed for the org-import to show the correct error message - Allow members with `can manage` access to a collection to import personal/non-collection backups/exports into the allowed collection. Fixes #5592 - Added remove collection functionality with Bulk Collection Editing. Fixes #5737 By fixing several responses like which users are a member of a collection or group some issues seem to have been resolved since I'm unable to reproduce them anymore. This is either thanks to those changes or some web-vault updates or both. - Fixes #5590 - Fixes #5609 --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

GiteaMirror added the pull-request label 2026-03-07 21:14:43 -06:00

GiteaMirror closed this issue

2026-03-07 21:14:43 -06:00

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: github-starred/vaultwarden#7304