Upload and download attachments, and added License file

src/db/models/cipher.rs

@@ -4,8 +4,11 @@ use serde_json::Value as JsonValue;
 
 use uuid::Uuid;
 
-#[derive(Queryable, Insertable, Identifiable)]
+use super::User;
+
+#[derive(Debug, Identifiable, Queryable, Insertable, Associations)]
 #[table_name = "ciphers"]
+#[belongs_to(User, foreign_key = "user_uuid")]
 #[primary_key(uuid)]
 pub struct Cipher {
     pub uuid: String,
@@ -24,15 +27,14 @@ pub struct Cipher {
 
     pub data: String,
     pub favorite: bool,
-    pub attachments: Option<Vec<u8>>,
 }
 
 /// Local methods
 impl Cipher {
-    pub fn new(user_uuid: String, type_: i32, favorite: bool) -> Cipher {
+    pub fn new(user_uuid: String, type_: i32, favorite: bool) -> Self {
         let now = Utc::now().naive_utc();
 
-        Cipher {
+        Self {
             uuid: Uuid::new_v4().to_string(),
             created_at: now,
             updated_at: now,
@@ -45,30 +47,8 @@ impl Cipher {
             favorite,
 
             data: String::new(),
-            attachments: None,
         }
     }
-
-    pub fn to_json(&self) -> JsonValue {
-        use serde_json;
-        use util::format_date;
-
-        let data: JsonValue = serde_json::from_str(&self.data).unwrap();
-
-        json!({
-            "Id": self.uuid,
-            "Type": self.type_,
-            "RevisionDate": format_date(&self.updated_at),
-            "FolderId": self.folder_uuid,
-            "Favorite": self.favorite,
-            "OrganizationId": "",
-            "Attachments": self.attachments,
-            "OrganizationUseTotp": false,
-            "Data": data,
-            "Object": "cipher",
-            "Edit": true,
-        })
-    }
 }
 
 use diesel;
@@ -78,6 +58,31 @@ use db::schema::ciphers;
 
 /// Database methods
 impl Cipher {
+    pub fn to_json(&self, conn: &DbConn) -> JsonValue {
+        use serde_json;
+        use util::format_date;
+        use super::Attachment;
+
+        let data_json: JsonValue = serde_json::from_str(&self.data).unwrap();
+
+        let attachments = Attachment::find_by_cipher(&self.uuid, conn);
+        let attachments_json: Vec<JsonValue> = attachments.iter().map(|c| c.to_json()).collect();
+
+        json!({
+            "Id": self.uuid,
+            "Type": self.type_,
+            "RevisionDate": format_date(&self.updated_at),
+            "FolderId": self.folder_uuid,
+            "Favorite": self.favorite,
+            "OrganizationId": "",
+            "Attachments": attachments_json,
+            "OrganizationUseTotp": false,
+            "Data": data_json,
+            "Object": "cipher",
+            "Edit": true,
+        })
+    }
+
     pub fn save(&self, conn: &DbConn) -> bool {
         // TODO: Update modified date
 
@@ -98,15 +103,15 @@ impl Cipher {
         }
     }
 
-    pub fn find_by_uuid(uuid: &str, conn: &DbConn) -> Option<Cipher> {
+    pub fn find_by_uuid(uuid: &str, conn: &DbConn) -> Option<Self> {
         ciphers::table
             .filter(ciphers::uuid.eq(uuid))
-            .first::<Cipher>(&**conn).ok()
+            .first::<Self>(&**conn).ok()
     }
 
-    pub fn find_by_user(user_uuid: &str, conn: &DbConn) -> Vec<Cipher> {
+    pub fn find_by_user(user_uuid: &str, conn: &DbConn) -> Vec<Self> {
         ciphers::table
             .filter(ciphers::user_uuid.eq(user_uuid))
-            .load::<Cipher>(&**conn).expect("Error loading ciphers")
+            .load::<Self>(&**conn).expect("Error loading ciphers")
     }
 }