1
0
Fork 0

Also list shared ciphers in find_by_user

Dieser Commit ist enthalten in:
Miroslav Prasil 2018-05-11 23:53:37 +01:00
Ursprung fcef2fa1f1
Commit 8bed867798
2 geänderte Dateien mit 27 neuen und 3 gelöschten Zeilen

Datei anzeigen

@ -503,7 +503,7 @@ fn delete_all(data: Json<PasswordData>, headers: Headers, conn: DbConn) -> Empty
} }
// Delete ciphers and their attachments // Delete ciphers and their attachments
for cipher in Cipher::find_by_user(&user.uuid, &conn) { for cipher in Cipher::find_owned_by_user(&user.uuid, &conn) {
_delete_cipher(cipher, &conn); _delete_cipher(cipher, &conn);
} }

Datei anzeigen

@ -223,7 +223,31 @@ impl Cipher {
.first::<Self>(&**conn).ok() .first::<Self>(&**conn).ok()
} }
// Find all ciphers accesible to user
pub fn find_by_user(user_uuid: &str, conn: &DbConn) -> Vec<Self> { pub fn find_by_user(user_uuid: &str, conn: &DbConn) -> Vec<Self> {
ciphers::table
.left_join(users_organizations::table.on(
ciphers::organization_uuid.eq(users_organizations::org_uuid.nullable()).and(
users_organizations::user_uuid.eq(user_uuid)
)
))
.left_join(ciphers_collections::table)
.left_join(users_collections::table.on(
ciphers_collections::collection_uuid.eq(users_collections::collection_uuid)
))
.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
)
)
))
.select(ciphers::all_columns)
.load::<Self>(&**conn).expect("Error loading ciphers")
}
// Find all ciphers directly owned by user
pub fn find_owned_by_user(user_uuid: &str, conn: &DbConn) -> Vec<Self> {
ciphers::table ciphers::table
.filter(ciphers::user_uuid.eq(user_uuid)) .filter(ciphers::user_uuid.eq(user_uuid))
.load::<Self>(&**conn).expect("Error loading ciphers") .load::<Self>(&**conn).expect("Error loading ciphers")