mirror of
https://github.com/dani-garcia/vaultwarden.git
synced 2025-11-25 22:22:33 +02:00
* Use Diesels MultiConnections Derive With this PR we remove almost all custom macro's to create the multiple database type code. This is now handled by Diesel it self. This removed the need of the following functions/macro's: - `db_object!` - `::to_db` - `.from_db()` It is also possible to just use one schema instead of multiple per type. Also done: - Refactored the SQLite backup function - Some formatting of queries so every call is one a separate line, this looks a bit better - Declare `conn` as mut inside each `db_run!` instead of having to declare it as `mut` in functions or calls - Added an `ACTIVE_DB_TYPE` static which holds the currently active database type - Removed `diesel_logger` crate and use Diesel's `set_default_instrumentation()` If you want debug queries you can now simply change the log level of `vaultwarden::db::query_logger` - Use PostgreSQL v17 in the Alpine images to match the Debian Trixie version - Optimized the Workflows since `diesel_logger` isn't needed anymore And on the extra plus-side, this lowers the compile-time and binary size too. Signed-off-by: BlackDex <black.dex@gmail.com> * Adjust query_logger and some other small items Signed-off-by: BlackDex <black.dex@gmail.com> * Remove macro, replaced with an function Signed-off-by: BlackDex <black.dex@gmail.com> * Implement custom connection manager Signed-off-by: BlackDex <black.dex@gmail.com> * Updated some crates to keep up2date Signed-off-by: BlackDex <black.dex@gmail.com> * Small adjustment Signed-off-by: BlackDex <black.dex@gmail.com> * crate updates Signed-off-by: BlackDex <black.dex@gmail.com> * Update crates Signed-off-by: BlackDex <black.dex@gmail.com> --------- Signed-off-by: BlackDex <black.dex@gmail.com>
101 lines
3.6 KiB
Rust
101 lines
3.6 KiB
Rust
use super::{CipherId, User, UserId};
|
|
use crate::db::schema::favorites;
|
|
use diesel::prelude::*;
|
|
|
|
#[derive(Identifiable, Queryable, Insertable)]
|
|
#[diesel(table_name = favorites)]
|
|
#[diesel(primary_key(user_uuid, cipher_uuid))]
|
|
pub struct Favorite {
|
|
pub user_uuid: UserId,
|
|
pub cipher_uuid: CipherId,
|
|
}
|
|
|
|
use crate::db::DbConn;
|
|
|
|
use crate::api::EmptyResult;
|
|
use crate::error::MapResult;
|
|
|
|
impl Favorite {
|
|
// Returns whether the specified cipher is a favorite of the specified user.
|
|
pub async fn is_favorite(cipher_uuid: &CipherId, user_uuid: &UserId, conn: &DbConn) -> bool {
|
|
db_run! { conn: {
|
|
let query = favorites::table
|
|
.filter(favorites::cipher_uuid.eq(cipher_uuid))
|
|
.filter(favorites::user_uuid.eq(user_uuid))
|
|
.count();
|
|
|
|
query.first::<i64>(conn)
|
|
.ok()
|
|
.unwrap_or(0) != 0
|
|
}}
|
|
}
|
|
|
|
// Sets whether the specified cipher is a favorite of the specified user.
|
|
pub async fn set_favorite(
|
|
favorite: bool,
|
|
cipher_uuid: &CipherId,
|
|
user_uuid: &UserId,
|
|
conn: &DbConn,
|
|
) -> EmptyResult {
|
|
let (old, new) = (Self::is_favorite(cipher_uuid, user_uuid, conn).await, favorite);
|
|
match (old, new) {
|
|
(false, true) => {
|
|
User::update_uuid_revision(user_uuid, conn).await;
|
|
db_run! { conn: {
|
|
diesel::insert_into(favorites::table)
|
|
.values((
|
|
favorites::user_uuid.eq(user_uuid),
|
|
favorites::cipher_uuid.eq(cipher_uuid),
|
|
))
|
|
.execute(conn)
|
|
.map_res("Error adding favorite")
|
|
}}
|
|
}
|
|
(true, false) => {
|
|
User::update_uuid_revision(user_uuid, conn).await;
|
|
db_run! { conn: {
|
|
diesel::delete(
|
|
favorites::table
|
|
.filter(favorites::user_uuid.eq(user_uuid))
|
|
.filter(favorites::cipher_uuid.eq(cipher_uuid))
|
|
)
|
|
.execute(conn)
|
|
.map_res("Error removing favorite")
|
|
}}
|
|
}
|
|
// Otherwise, the favorite status is already what it should be.
|
|
_ => Ok(()),
|
|
}
|
|
}
|
|
|
|
// Delete all favorite entries associated with the specified cipher.
|
|
pub async fn delete_all_by_cipher(cipher_uuid: &CipherId, conn: &DbConn) -> EmptyResult {
|
|
db_run! { conn: {
|
|
diesel::delete(favorites::table.filter(favorites::cipher_uuid.eq(cipher_uuid)))
|
|
.execute(conn)
|
|
.map_res("Error removing favorites by cipher")
|
|
}}
|
|
}
|
|
|
|
// Delete all favorite entries associated with the specified user.
|
|
pub async fn delete_all_by_user(user_uuid: &UserId, conn: &DbConn) -> EmptyResult {
|
|
db_run! { conn: {
|
|
diesel::delete(favorites::table.filter(favorites::user_uuid.eq(user_uuid)))
|
|
.execute(conn)
|
|
.map_res("Error removing favorites by user")
|
|
}}
|
|
}
|
|
|
|
/// Return a vec with (cipher_uuid) this will only contain favorite flagged ciphers
|
|
/// This is used during a full sync so we only need one query for all favorite cipher matches.
|
|
pub async fn get_all_cipher_uuid_by_user(user_uuid: &UserId, conn: &DbConn) -> Vec<CipherId> {
|
|
db_run! { conn: {
|
|
favorites::table
|
|
.filter(favorites::user_uuid.eq(user_uuid))
|
|
.select(favorites::cipher_uuid)
|
|
.load::<CipherId>(conn)
|
|
.unwrap_or_default()
|
|
}}
|
|
}
|
|
}
|