From 4d9d649db98c4d80f121dce2c4661f548c39633a Mon Sep 17 00:00:00 2001
From: Jeremy Lin <jeremy.lin@gmail.com>
Date: Sat, 7 Jan 2023 10:41:28 -0800
Subject: [PATCH] Change `text/plain` API responses to `application/json`
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.
---
src/api/core/accounts.rs | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/api/core/accounts.rs b/src/api/core/accounts.rs
index 3315fbce..cb6dc4fc 100644
--- a/src/api/core/accounts.rs
+++ b/src/api/core/accounts.rs
@@ -629,9 +629,9 @@ async fn delete_account(data: JsonUpcase<PasswordData>, headers: Headers, mut co
}
#[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();
- revision_date.to_string()
+ Ok(Json(json!(revision_date)))
}
#[derive(Deserialize)]
@@ -761,14 +761,11 @@ async fn rotate_api_key(data: JsonUpcase<SecretVerificationRequest>, headers: He
}
#[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
+ let mut result = false;
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 {
- Some(_) => String::from("true"),
- _ => String::from("false"),
- }
- } else {
- String::from("false")
+ result = Device::find_by_uuid_and_user(&uuid, &user.uuid, &mut conn).await.is_some();
}
+ Ok(Json(json!(result)))
}