OpenSource/vaultwarden
OpenSource/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2024-11-25 08:36:25 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove compatibility route (#4578)

Browse source
This commit is contained in:
Timshel 2024-05-25 15:29:58 +02:00 committed by GitHub
parent f01ef40a8e
commit 9555ac7bb8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/api/core/accounts.rs
View file

@ -50,7 +50,6 @@ pub fn routes() -> Vec<rocket::Route> {
api_key, api_key,
rotate_api_key, rotate_api_key,
get_known_device, get_known_device,
get_known_device_from_path,
put_avatar, put_avatar,
put_device_token, put_device_token,
put_clear_device_token, put_clear_device_token,
@ -979,22 +978,15 @@ async fn rotate_api_key(data: JsonUpcase<PasswordOrOtpData>, headers: Headers, c
_api_key(data, true, headers, conn).await _api_key(data, true, headers, conn).await
} }
// This variant is deprecated: https://github.com/bitwarden/server/pull/2682 #[get("/devices/knowndevice")]
#[get("/devices/knowndevice/<email>/<uuid>")] async fn get_known_device(device: KnownDevice, mut conn: DbConn) -> JsonResult {
async fn get_known_device_from_path(email: &str, uuid: &str, mut conn: DbConn) -> JsonResult {
// This endpoint doesn't have auth header
let mut result = false; let mut result = false;
if let Some(user) = User::find_by_mail(email, &mut conn).await { if let Some(user) = User::find_by_mail(&device.email, &mut conn).await {
result = Device::find_by_uuid_and_user(uuid, &user.uuid, &mut conn).await.is_some(); result = Device::find_by_uuid_and_user(&device.uuid, &user.uuid, &mut conn).await.is_some();
} }
Ok(Json(json!(result))) Ok(Json(json!(result)))
} }
#[get("/devices/knowndevice")]
async fn get_known_device(device: KnownDevice, conn: DbConn) -> JsonResult {
get_known_device_from_path(&device.email, &device.uuid, conn).await
}
struct KnownDevice { struct KnownDevice {
email: String, email: String,
uuid: String, uuid: String,