commit f9ecb7201b0059dbe142ff6744c08550bd5b0dcf
parent 3cb911a52f4a8e4e1aa69f4023b6a8cc1ebf21cb
Author: Daniel GarcĂa <dani-garcia@users.noreply.github.com>
Date: Fri, 16 Nov 2018 16:17:21 +0100
Merge pull request #256 from mprasil/fix_accepted_sync
Prevent accepted user from seeing ciphers until confirmed (fixes #196)
Diffstat:
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/db/models/cipher.rs b/src/db/models/cipher.rs
@@ -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)
+ )
)
)
))