Mirrors/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-06-12 21:27:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into rocket-0.4

Browse Source 
# Conflicts:
#	Cargo.lock
#	Cargo.toml
#	src/api/core/mod.rs
This commit is contained in:
Daniel García
2018-11-19 19:52:43 +01:00
parent f84cbeaaf8 1d4944b88e
commit 5edbd0e952
8 changed files with 594 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/db/models/cipher.rs
View File

@ -318,7 +318,9 @@ impl Cipher {
.filter(ciphers::user_uuid.eq(user_uuid).or( // Cipher owner
users_organizations::access_all.eq(true).or( // access_all in Organization
users_organizations::type_.le(UserOrgType::Admin as i32).or( // Org admin or owner
users_collections::user_uuid.eq(user_uuid) // Access to Collection
users_collections::user_uuid.eq(user_uuid).and( // Access to Collection
users_organizations::status.eq(UserOrgStatus::Confirmed as i32)
)
)
)
))