Mirrors/vaultwarden
2
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden synced 2024-11-22 20:03:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix wrong case in import struct, invite collections and user Uri back-compat

Browse source
This commit is contained in:
Daniel García 2018-06-13 14:25:50 +02:00
parent f24e754ff7
commit 0905355629
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/api/core/ciphers.rs
View file

@ -206,9 +206,9 @@ struct ImportData {
#[allow(non_snake_case)] #[allow(non_snake_case)]
struct RelationsData { struct RelationsData {
// Cipher id // Cipher id
key: usize, Key: usize,
// Folder id // Folder id
value: usize, Value: usize,
} }
@ -228,7 +228,7 @@ fn post_ciphers_import(data: JsonUpcase<ImportData>, headers: Headers, conn: DbC
let mut relations_map = HashMap::new(); let mut relations_map = HashMap::new();
for relation in data.FolderRelationships { for relation in data.FolderRelationships {
relations_map.insert(relation.key, relation.value); relations_map.insert(relation.Key, relation.Value);
} }
// Read and create the ciphers // Read and create the ciphers

14
src/api/core/organizations.rs
View file

@ -288,8 +288,8 @@ fn get_org_users(org_id: String, headers: AdminHeaders, conn: DbConn) -> JsonRes
#[derive(Deserialize)] #[derive(Deserialize)]
#[allow(non_snake_case)] #[allow(non_snake_case)]
struct CollectionData { struct CollectionData {
id: String, Id: String,
readOnly: bool, ReadOnly: bool,
} }
#[derive(Deserialize)] #[derive(Deserialize)]
@ -331,10 +331,10 @@ fn send_invite(org_id: String, data: JsonUpcase<InviteData>, headers: AdminHeade
// If no accessAll, add the collections received // If no accessAll, add the collections received
if !access_all { if !access_all {
for col in &data.Collections { for col in &data.Collections {
match Collection::find_by_uuid_and_org(&col.id, &org_id, &conn) { match Collection::find_by_uuid_and_org(&col.Id, &org_id, &conn) {
None => err!("Collection not found in Organization"), None => err!("Collection not found in Organization"),
Some(collection) => { Some(collection) => {
if CollectionUser::save(&user.uuid, &collection.uuid, col.readOnly, &conn).is_err() { if CollectionUser::save(&user.uuid, &collection.uuid, col.ReadOnly, &conn).is_err() {
err!("Failed saving collection access for user") err!("Failed saving collection access for user")
} }
} }
@ -373,7 +373,7 @@ fn confirm_invite(org_id: String, user_id: String, data: JsonUpcase<Value>, head
} }
user_to_confirm.status = UserOrgStatus::Confirmed as i32; user_to_confirm.status = UserOrgStatus::Confirmed as i32;
user_to_confirm.key = match data["key"].as_str() { user_to_confirm.key = match data["Key"].as_str() {
Some(key) => key.to_string(), Some(key) => key.to_string(),
None => err!("Invalid key provided") None => err!("Invalid key provided")
}; };
@ -455,10 +455,10 @@ fn edit_user(org_id: String, user_id: String, data: JsonUpcase<EditUserData>, he
// If no accessAll, add the collections received // If no accessAll, add the collections received
if !data.AccessAll { if !data.AccessAll {
for col in &data.Collections { for col in &data.Collections {
match Collection::find_by_uuid_and_org(&col.id, &org_id, &conn) { match Collection::find_by_uuid_and_org(&col.Id, &org_id, &conn) {
None => err!("Collection not found in Organization"), None => err!("Collection not found in Organization"),
Some(collection) => { Some(collection) => {
if CollectionUser::save(&user_to_edit.user_uuid, &collection.uuid, col.readOnly, &conn).is_err() { if CollectionUser::save(&user_to_edit.user_uuid, &collection.uuid, col.ReadOnly, &conn).is_err() {
err!("Failed saving collection access for user") err!("Failed saving collection access for user")
} }
} }

2
src/db/models/cipher.rs
View file

@ -84,7 +84,7 @@ impl Cipher {
// To remove backwards compatibility, just remove this entire section // To remove backwards compatibility, just remove this entire section
// and remove the compat code from ciphers::update_cipher_from_data // and remove the compat code from ciphers::update_cipher_from_data
if self.type_ == 1 && data_json["Uris"].is_array() { if self.type_ == 1 && data_json["Uris"].is_array() {
let uri = data_json["Uris"][0]["uri"].clone(); let uri = data_json["Uris"][0]["Uri"].clone();
data_json["Uri"] = uri; data_json["Uri"] = uri;
} }
// TODO: ******* Backwards compat end ********** // TODO: ******* Backwards compat end **********