Browse Source
Remove unnecessary fields from send access
pull/1499/head
Daniel García
4 years ago
No known key found for this signature in database
GPG Key ID: FC8A7D14C3CD543A
2 changed files with
19 additions and
1 deletions
-
src/api/core/sends.rs
-
src/db/models/send.rs
|
|
@ -231,7 +231,7 @@ fn post_access(access_id: String, data: JsonUpcase<SendAccessData>, conn: DbConn |
|
|
|
|
|
|
|
send.save(&conn)?; |
|
|
|
|
|
|
|
Ok(Json(send.to_json())) |
|
|
|
Ok(Json(send.to_json_access())) |
|
|
|
} |
|
|
|
|
|
|
|
#[post("/sends/<send_id>/access/file/<file_id>", data = "<data>")] |
|
|
|
|
|
@ -130,6 +130,24 @@ impl Send { |
|
|
|
"Object": "send", |
|
|
|
}) |
|
|
|
} |
|
|
|
|
|
|
|
pub fn to_json_access(&self) -> Value { |
|
|
|
use crate::util::format_date; |
|
|
|
|
|
|
|
let data: Value = serde_json::from_str(&self.data).unwrap_or_default(); |
|
|
|
|
|
|
|
json!({ |
|
|
|
"Id": self.uuid, |
|
|
|
"Type": self.atype, |
|
|
|
|
|
|
|
"Name": self.name, |
|
|
|
"Text": if self.atype == SendType::Text as i32 { Some(&data) } else { None }, |
|
|
|
"File": if self.atype == SendType::File as i32 { Some(&data) } else { None }, |
|
|
|
|
|
|
|
"ExpirationDate": self.expiration_date.as_ref().map(format_date), |
|
|
|
"Object": "send-access", |
|
|
|
}) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
use crate::db::DbConn; |
|
|
|