This PR fixes#2566
If Organizational syncs returned a FolderId it would cause the web-vault
to hide the cipher because there is a FolderId set. Upstream seems to
not return FolderId and Favorite. When set to null/false it will behave
the same.
In this PR I have added a new CipherSyncType enum to select which type
of sync to execute, and return an empty list for both Folders and Favorites if this is for Orgs.
This also reduces the database load a bit since it will not execute those queries.
🔄 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/2567
**Author:** [@BlackDex](https://github.com/BlackDex)
**Created:** 6/21/2022
**Status:** ✅ Merged
**Merged:** 6/26/2022
**Merged by:** [@dani-garcia](https://github.com/dani-garcia)
**Base:** `main` ← **Head:** `fix-issue-2566`
---
### 📝 Commits (1)
- [`b71d9dd`](https://github.com/dani-garcia/vaultwarden/commit/b71d9dd53e447eb66786d0890fb4b595210de158) Fix for issue #2566
### 📊 Changes
**4 files changed** (+35 additions, -17 deletions)
<details>
<summary>View changed files</summary>
📝 `src/api/core/ciphers.rs` (+25 -11)
📝 `src/api/core/emergency_access.rs` (+6 -2)
📝 `src/api/core/mod.rs` (+1 -1)
📝 `src/api/core/organizations.rs` (+3 -3)
</details>
### 📄 Description
This PR fixes #2566
If Organizational syncs returned a FolderId it would cause the web-vault
to hide the cipher because there is a FolderId set. Upstream seems to
not return FolderId and Favorite. When set to null/false it will behave
the same.
In this PR I have added a new CipherSyncType enum to select which type
of sync to execute, and return an empty list for both Folders and Favorites if this is for Orgs.
This also reduces the database load a bit since it will not execute those queries.
---
<sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.
📋 Pull Request Information
Original PR: https://github.com/dani-garcia/vaultwarden/pull/2567
Author: @BlackDex
Created: 6/21/2022
Status: ✅ Merged
Merged: 6/26/2022
Merged by: @dani-garcia
Base:
main← Head:fix-issue-2566📝 Commits (1)
b71d9ddFix for issue [PR #297] [MERGED] Update vault to 2.7.1 (#2566)📊 Changes
4 files changed (+35 additions, -17 deletions)
View changed files
📝
src/api/core/ciphers.rs(+25 -11)📝
src/api/core/emergency_access.rs(+6 -2)📝
src/api/core/mod.rs(+1 -1)📝
src/api/core/organizations.rs(+3 -3)📄 Description
This PR fixes #2566
If Organizational syncs returned a FolderId it would cause the web-vault
to hide the cipher because there is a FolderId set. Upstream seems to
not return FolderId and Favorite. When set to null/false it will behave
the same.
In this PR I have added a new CipherSyncType enum to select which type
of sync to execute, and return an empty list for both Folders and Favorites if this is for Orgs.
This also reduces the database load a bit since it will not execute those queries.
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.