client-api: Fix response serde for get[_latest]_backup

crates/ruma-client-api/src/r0/backup/get_backup.rs

@@ -3,6 +3,8 @@
 use js_int::UInt;
 use ruma_api::ruma_api;
 use ruma_serde::Raw;
+use serde::{ser, Deserialize, Deserializer, Serialize};
+use serde_json::value::{to_raw_value as to_raw_json_value, RawValue as RawJsonValue};
 
 use super::BackupAlgorithm;
 
@@ -22,9 +24,9 @@ ruma_api! {
         pub version: &'a str,
     }
 
+    #[ruma_api(manual_body_serde)]
     response: {
         /// The algorithm used for storing backups.
-        #[serde(flatten)]
         pub algorithm: Raw<BackupAlgorithm>,
 
         /// The number of keys stored in the backup.
@@ -61,3 +63,63 @@ impl Response {
         Self { algorithm, count, etag, version }
     }
 }
+
+#[derive(Deserialize)]
+pub(super) struct ResponseBodyRepr {
+    pub algorithm: Box<RawJsonValue>,
+    pub auth_data: Box<RawJsonValue>,
+    pub count: UInt,
+    pub etag: String,
+    pub version: String,
+}
+
+#[derive(Serialize)]
+pub(super) struct RefResponseBodyRepr<'a> {
+    pub algorithm: &'a RawJsonValue,
+    pub auth_data: &'a RawJsonValue,
+    pub count: UInt,
+    pub etag: &'a str,
+    pub version: &'a str,
+}
+
+#[derive(Deserialize, Serialize)]
+pub(super) struct AlgorithmWithData {
+    pub algorithm: Box<RawJsonValue>,
+    pub auth_data: Box<RawJsonValue>,
+}
+
+impl<'de> Deserialize<'de> for ResponseBody {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        let ResponseBodyRepr { algorithm, auth_data, count, etag, version } =
+            ResponseBodyRepr::deserialize(deserializer)?;
+
+        let algorithm =
+            Raw::from_json(to_raw_json_value(&AlgorithmWithData { algorithm, auth_data }).unwrap());
+
+        Ok(Self { algorithm, count, etag, version })
+    }
+}
+
+impl Serialize for ResponseBody {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        let ResponseBody { algorithm, count, etag, version } = self;
+        let AlgorithmWithData { algorithm, auth_data } =
+            algorithm.deserialize_as().map_err(ser::Error::custom)?;
+
+        let repr = RefResponseBodyRepr {
+            algorithm: &algorithm,
+            auth_data: &auth_data,
+            count: *count,
+            etag,
+            version,
+        };
+
+        repr.serialize(serializer)
+    }
+}

crates/ruma-client-api/src/r0/backup/get_latest_backup.rs

@@ -3,8 +3,13 @@
 use js_int::UInt;
 use ruma_api::ruma_api;
 use ruma_serde::Raw;
+use serde::{ser, Deserialize, Deserializer, Serialize};
+use serde_json::value::to_raw_value as to_raw_json_value;
 
-use super::BackupAlgorithm;
+use super::{
+    get_backup::{AlgorithmWithData, RefResponseBodyRepr, ResponseBodyRepr},
+    BackupAlgorithm,
+};
 
 ruma_api! {
     metadata: {
@@ -19,9 +24,9 @@ ruma_api! {
     #[derive(Default)]
     request: {}
 
+    #[ruma_api(manual_body_serde)]
     response: {
         /// The algorithm used for storing backups.
-        #[serde(flatten)]
         pub algorithm: Raw<BackupAlgorithm>,
 
         /// The number of keys stored in the backup.
@@ -58,3 +63,39 @@ impl Response {
         Self { algorithm, count, etag, version }
     }
 }
+
+impl<'de> Deserialize<'de> for ResponseBody {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        let ResponseBodyRepr { algorithm, auth_data, count, etag, version } =
+            ResponseBodyRepr::deserialize(deserializer)?;
+
+        let algorithm =
+            Raw::from_json(to_raw_json_value(&AlgorithmWithData { algorithm, auth_data }).unwrap());
+
+        Ok(Self { algorithm, count, etag, version })
+    }
+}
+
+impl Serialize for ResponseBody {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        let ResponseBody { algorithm, count, etag, version } = self;
+        let AlgorithmWithData { algorithm, auth_data } =
+            algorithm.deserialize_as().map_err(ser::Error::custom)?;
+
+        let repr = RefResponseBodyRepr {
+            algorithm: &algorithm,
+            auth_data: &auth_data,
+            count: *count,
+            etag,
+            version,
+        };
+
+        repr.serialize(serializer)
+    }
+}