octoleo/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2024-11-14 17:34:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change text/plain API responses to application/json

Browse Source 
Recent versions of the Bitwarden clients (see bitwarden/clients#3574)
won't parse non-JSON responses. The most noticeable consequence is that
`/api/accounts/revision-date` responses won't be parsed, leading to
`/api/sync` always being called, even when it's not necessary.
This commit is contained in:
Jeremy Lin 2023-01-07 10:41:28 -08:00 committed by Daniel García
parent 8e6fd4b4a1
commit 6541600af6
No known key found for this signature in database
GPG Key ID: FC8A7D14C3CD543A
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/api/core/accounts.rs
View File

@ -660,9 +660,9 @@ async fn delete_account(data: JsonUpcase<PasswordData>, headers: Headers, mut co
} }
#[get("/accounts/revision-date")] #[get("/accounts/revision-date")]
fn revision_date(headers: Headers) -> String { fn revision_date(headers: Headers) -> JsonResult {
let revision_date = headers.user.updated_at.timestamp_millis(); let revision_date = headers.user.updated_at.timestamp_millis();
revision_date.to_string() Ok(Json(json!(revision_date)))
} }
#[derive(Deserialize)] #[derive(Deserialize)]
@ -792,14 +792,11 @@ async fn rotate_api_key(data: JsonUpcase<SecretVerificationRequest>, headers: He
} }
#[get("/devices/knowndevice/<email>/<uuid>")] #[get("/devices/knowndevice/<email>/<uuid>")]
async fn get_known_device(email: String, uuid: String, mut conn: DbConn) -> String { async fn get_known_device(email: String, uuid: String, mut conn: DbConn) -> JsonResult {
// This endpoint doesn't have auth header // This endpoint doesn't have auth header
let mut result = false;
if let Some(user) = User::find_by_mail(&email, &mut conn).await { if let Some(user) = User::find_by_mail(&email, &mut conn).await {
match Device::find_by_uuid_and_user(&uuid, &user.uuid, &mut conn).await { result = Device::find_by_uuid_and_user(&uuid, &user.uuid, &mut conn).await.is_some();
Some(_) => String::from("true"),
_ => String::from("false"),
}
} else {
String::from("false")
} }
Ok(Json(json!(result)))
} }