1
0
Fork 0

Send create, update and delete notifications for Sends in the correct format.

Add endpoints to get all sends or a specific send by its uuid.
Dieser Commit ist enthalten in:
Fabian Thies 2021-08-03 17:33:59 +02:00
Ursprung c666497130
Commit dd98fe860b
3 geänderte Dateien mit 58 neuen und 10 gelöschten Zeilen

Datei anzeigen

@ -18,6 +18,8 @@ const SEND_INACCESSIBLE_MSG: &str = "Send does not exist or is no longer availab
pub fn routes() -> Vec<rocket::Route> { pub fn routes() -> Vec<rocket::Route> {
routes![ routes![
get_sends,
get_send,
post_send, post_send,
post_send_file, post_send_file,
post_access, post_access,
@ -128,6 +130,32 @@ fn create_send(data: SendData, user_uuid: String) -> ApiResult<Send> {
Ok(send) Ok(send)
} }
#[get("/sends")]
fn get_sends(headers: Headers, conn: DbConn) -> Json<Value> {
let sends = Send::find_by_user(&headers.user.uuid, &conn);
let sends_json: Vec<Value> = sends.iter().map(|s| s.to_json()).collect();
Json(json!({
"Data": sends_json,
"Object": "list",
"ContinuationToken": null
}))
}
#[get("/sends/<uuid>")]
fn get_send(uuid: String, headers: Headers, conn: DbConn) -> JsonResult {
let send = match Send::find_by_uuid(&uuid, &conn) {
Some(send) => send,
None => err!("Send not found"),
};
if send.user_uuid.as_ref() != Some(&headers.user.uuid) {
err!("Send is not owned by user")
}
Ok(Json(send.to_json()))
}
#[post("/sends", data = "<data>")] #[post("/sends", data = "<data>")]
fn post_send(data: JsonUpcase<SendData>, headers: Headers, conn: DbConn, nt: Notify) -> JsonResult { fn post_send(data: JsonUpcase<SendData>, headers: Headers, conn: DbConn, nt: Notify) -> JsonResult {
enforce_disable_send_policy(&headers, &conn)?; enforce_disable_send_policy(&headers, &conn)?;
@ -141,7 +169,7 @@ fn post_send(data: JsonUpcase<SendData>, headers: Headers, conn: DbConn, nt: Not
let mut send = create_send(data, headers.user.uuid.clone())?; let mut send = create_send(data, headers.user.uuid.clone())?;
send.save(&conn)?; send.save(&conn)?;
nt.send_user_update(UpdateType::SyncSendCreate, &headers.user); nt.send_send_update(UpdateType::SyncSendCreate, &send, &send.update_users_revision(&conn));
Ok(Json(send.to_json())) Ok(Json(send.to_json()))
} }
@ -225,7 +253,7 @@ fn post_send_file(data: Data, content_type: &ContentType, headers: Headers, conn
// Save the changes in the database // Save the changes in the database
send.save(&conn)?; send.save(&conn)?;
nt.send_user_update(UpdateType::SyncSendCreate, &headers.user); nt.send_send_update(UpdateType::SyncSendUpdate, &send, &send.update_users_revision(&conn));
Ok(Json(send.to_json())) Ok(Json(send.to_json()))
} }
@ -397,7 +425,7 @@ fn put_send(id: String, data: JsonUpcase<SendData>, headers: Headers, conn: DbCo
} }
send.save(&conn)?; send.save(&conn)?;
nt.send_user_update(UpdateType::SyncSendUpdate, &headers.user); nt.send_send_update(UpdateType::SyncSendUpdate, &send, &send.update_users_revision(&conn));
Ok(Json(send.to_json())) Ok(Json(send.to_json()))
} }
@ -414,7 +442,7 @@ fn delete_send(id: String, headers: Headers, conn: DbConn, nt: Notify) -> EmptyR
} }
send.delete(&conn)?; send.delete(&conn)?;
nt.send_user_update(UpdateType::SyncSendDelete, &headers.user); nt.send_send_update(UpdateType::SyncSendDelete, &send, &send.update_users_revision(&conn));
Ok(()) Ok(())
} }
@ -434,7 +462,7 @@ fn put_remove_password(id: String, headers: Headers, conn: DbConn, nt: Notify) -
send.set_password(None); send.set_password(None);
send.save(&conn)?; send.save(&conn)?;
nt.send_user_update(UpdateType::SyncSendUpdate, &headers.user); nt.send_send_update(UpdateType::SyncSendUpdate, &send, &send.update_users_revision(&conn));
Ok(Json(send.to_json())) Ok(Json(send.to_json()))
} }

Datei anzeigen

@ -65,7 +65,7 @@ use chashmap::CHashMap;
use chrono::NaiveDateTime; use chrono::NaiveDateTime;
use serde_json::from_str; use serde_json::from_str;
use crate::db::models::{Cipher, Folder, User}; use crate::db::models::{Cipher, Folder, User, Send};
use rmpv::Value; use rmpv::Value;
@ -335,6 +335,23 @@ impl WebSocketUsers {
self.send_update(uuid, &data).ok(); self.send_update(uuid, &data).ok();
} }
} }
pub fn send_send_update(&self, ut: UpdateType, send: &Send, user_uuids: &[String]) {
let user_uuid = convert_option(send.user_uuid.clone());
let data = create_update(
vec![
("Id".into(), send.uuid.clone().into()),
("UserId".into(), user_uuid),
("RevisionDate".into(), serialize_date(send.revision_date)),
],
ut,
);
for uuid in user_uuids {
self.send_update(uuid, &data).ok();
}
}
} }
/* Message Structure /* Message Structure

Datei anzeigen

@ -232,15 +232,18 @@ impl Send {
} }
} }
pub fn update_users_revision(&self, conn: &DbConn) { pub fn update_users_revision(&self, conn: &DbConn) -> Vec<String> {
match &self.user_uuid { let mut user_uuids = Vec::new();
Some(user_uuid) => { match self.user_uuid {
Some(ref user_uuid) => {
User::update_uuid_revision(user_uuid, conn); User::update_uuid_revision(user_uuid, conn);
user_uuids.push(user_uuid.clone())
} }
None => { None => {
// Belongs to Organization, not implemented // Belongs to Organization, not implemented
} }
} };
user_uuids
} }
pub fn delete_all_by_user(user_uuid: &str, conn: &DbConn) -> EmptyResult { pub fn delete_all_by_user(user_uuid: &str, conn: &DbConn) -> EmptyResult {