vw_small

commit 0905355629e95699039771fac7dce3483f083740
parent f24e754ff7ce071985a7e77f6c82b7fe4fbb0283
Author: Daniel García <dani-garcia@users.noreply.github.com>
Date:   Wed, 13 Jun 2018 14:25:50 +0200

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

Diffstat:
M
src/api/core/ciphers.rs
 | 
6
+++---
M
src/api/core/organizations.rs
 | 
14
+++++++-------
M
src/db/models/cipher.rs
 | 
2
+-

3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/api/core/ciphers.rs b/src/api/core/ciphers.rs
@@ -206,9 +206,9 @@ struct ImportData {
 #[allow(non_snake_case)]
 struct RelationsData {
     // Cipher id
-    key: usize,
+    Key: usize,
     // 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();
 
     for relation in data.FolderRelationships {
-        relations_map.insert(relation.key, relation.value);
+        relations_map.insert(relation.Key, relation.Value);
     }
 
     // Read and create the ciphers
diff --git a/src/api/core/organizations.rs b/src/api/core/organizations.rs
@@ -288,8 +288,8 @@ fn get_org_users(org_id: String, headers: AdminHeaders, conn: DbConn) -> JsonRes
 #[derive(Deserialize)]
 #[allow(non_snake_case)]
 struct CollectionData {
-    id: String,
-    readOnly: bool,
+    Id: String,
+    ReadOnly: bool,
 }
 
 #[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 !access_all {
                     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"),
                             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")
                                 }
                             }
@@ -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.key = match data["key"].as_str() {
+    user_to_confirm.key = match data["Key"].as_str() {
         Some(key) => key.to_string(),
         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 !data.AccessAll {
         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"),
                 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")
                     }
                 }
diff --git a/src/db/models/cipher.rs b/src/db/models/cipher.rs
@@ -84,7 +84,7 @@ impl Cipher {
         // To remove backwards compatibility, just remove this entire section
         // and remove the compat code from ciphers::update_cipher_from_data
         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;
         }
         // TODO: ******* Backwards compat end **********