mirror of
https://github.com/dani-garcia/vaultwarden.git
synced 2026-04-13 17:34:28 +03:00
f07a91141a
In newer versions of Bitwarden Clients instead of using `null` the folder_id will be an empty string. This commit adds a special deserialize_with function to keep the same way of working code-wise. Fixes #6962 Signed-off-by: BlackDex <black.dex@gmail.com>
108 lines
3.3 KiB
Rust
108 lines
3.3 KiB
Rust
use rocket::serde::json::Json;
|
|
use serde_json::Value;
|
|
|
|
use crate::{
|
|
api::{EmptyResult, JsonResult, Notify, UpdateType},
|
|
auth::Headers,
|
|
db::{
|
|
models::{Folder, FolderId},
|
|
DbConn,
|
|
},
|
|
util::deser_opt_nonempty_str,
|
|
};
|
|
|
|
pub fn routes() -> Vec<rocket::Route> {
|
|
routes![get_folders, get_folder, post_folders, post_folder, put_folder, delete_folder_post, delete_folder,]
|
|
}
|
|
|
|
#[get("/folders")]
|
|
async fn get_folders(headers: Headers, conn: DbConn) -> Json<Value> {
|
|
let folders = Folder::find_by_user(&headers.user.uuid, &conn).await;
|
|
let folders_json: Vec<Value> = folders.iter().map(Folder::to_json).collect();
|
|
|
|
Json(json!({
|
|
"data": folders_json,
|
|
"object": "list",
|
|
"continuationToken": null,
|
|
}))
|
|
}
|
|
|
|
#[get("/folders/<folder_id>")]
|
|
async fn get_folder(folder_id: FolderId, headers: Headers, conn: DbConn) -> JsonResult {
|
|
match Folder::find_by_uuid_and_user(&folder_id, &headers.user.uuid, &conn).await {
|
|
Some(folder) => Ok(Json(folder.to_json())),
|
|
_ => err!("Invalid folder", "Folder does not exist or belongs to another user"),
|
|
}
|
|
}
|
|
|
|
#[derive(Deserialize)]
|
|
#[serde(rename_all = "camelCase")]
|
|
pub struct FolderData {
|
|
pub name: String,
|
|
#[serde(default, deserialize_with = "deser_opt_nonempty_str")]
|
|
pub id: Option<FolderId>,
|
|
}
|
|
|
|
#[post("/folders", data = "<data>")]
|
|
async fn post_folders(data: Json<FolderData>, headers: Headers, conn: DbConn, nt: Notify<'_>) -> JsonResult {
|
|
let data: FolderData = data.into_inner();
|
|
|
|
let mut folder = Folder::new(headers.user.uuid, data.name);
|
|
|
|
folder.save(&conn).await?;
|
|
nt.send_folder_update(UpdateType::SyncFolderCreate, &folder, &headers.device, &conn).await;
|
|
|
|
Ok(Json(folder.to_json()))
|
|
}
|
|
|
|
#[post("/folders/<folder_id>", data = "<data>")]
|
|
async fn post_folder(
|
|
folder_id: FolderId,
|
|
data: Json<FolderData>,
|
|
headers: Headers,
|
|
conn: DbConn,
|
|
nt: Notify<'_>,
|
|
) -> JsonResult {
|
|
put_folder(folder_id, data, headers, conn, nt).await
|
|
}
|
|
|
|
#[put("/folders/<folder_id>", data = "<data>")]
|
|
async fn put_folder(
|
|
folder_id: FolderId,
|
|
data: Json<FolderData>,
|
|
headers: Headers,
|
|
conn: DbConn,
|
|
nt: Notify<'_>,
|
|
) -> JsonResult {
|
|
let data: FolderData = data.into_inner();
|
|
|
|
let Some(mut folder) = Folder::find_by_uuid_and_user(&folder_id, &headers.user.uuid, &conn).await else {
|
|
err!("Invalid folder", "Folder does not exist or belongs to another user")
|
|
};
|
|
|
|
folder.name = data.name;
|
|
|
|
folder.save(&conn).await?;
|
|
nt.send_folder_update(UpdateType::SyncFolderUpdate, &folder, &headers.device, &conn).await;
|
|
|
|
Ok(Json(folder.to_json()))
|
|
}
|
|
|
|
#[post("/folders/<folder_id>/delete")]
|
|
async fn delete_folder_post(folder_id: FolderId, headers: Headers, conn: DbConn, nt: Notify<'_>) -> EmptyResult {
|
|
delete_folder(folder_id, headers, conn, nt).await
|
|
}
|
|
|
|
#[delete("/folders/<folder_id>")]
|
|
async fn delete_folder(folder_id: FolderId, headers: Headers, conn: DbConn, nt: Notify<'_>) -> EmptyResult {
|
|
let Some(folder) = Folder::find_by_uuid_and_user(&folder_id, &headers.user.uuid, &conn).await else {
|
|
err!("Invalid folder", "Folder does not exist or belongs to another user")
|
|
};
|
|
|
|
// Delete the actual folder entry
|
|
folder.delete(&conn).await?;
|
|
|
|
nt.send_folder_update(UpdateType::SyncFolderDelete, &folder, &headers.device, &conn).await;
|
|
Ok(())
|
|
}
|