chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

client-api: Add support for deserializing thirdparty_id_creds from an object

Browse Source
This commit is contained in:
Jonas Platte 2021-11-03 18:23:05 +01:00
parent 076420d798
commit 8b0687b08c
No known key found for this signature in database
GPG Key ID: CC154DE0E30B7C67
1 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
crates/ruma-client-api/src/r0/uiaa.rs
View File

@ -524,7 +524,14 @@ impl IncomingOAuth2 {
pub struct EmailIdentity<'a> {
/// Thirdparty identifier credentials.
#[cfg_attr(not(feature = "compat"), serde(rename = "threepidCreds"))]
#[cfg_attr(feature = "compat", serde(rename = "threepid_creds", alias = "threepidCreds"))]
#[cfg_attr(
feature = "compat",
serde(
rename = "threepid_creds",
alias = "threepidCreds",
deserialize_with = "deserialize_thirdparty_id_creds"
)
)]
pub thirdparty_id_creds: &'a [ThirdpartyIdCredentials],
/// The value of the session key given by the homeserver, if any.
@ -552,7 +559,14 @@ impl IncomingEmailIdentity {
pub struct Msisdn<'a> {
/// Thirdparty identifier credentials.
#[cfg_attr(not(feature = "compat"), serde(rename = "threepidCreds"))]
#[cfg_attr(feature = "compat", serde(rename = "threepid_creds", alias = "threepidCreds"))]
#[cfg_attr(
feature = "compat",
serde(
rename = "threepid_creds",
alias = "threepidCreds",
deserialize_with = "deserialize_thirdparty_id_creds"
)
)]
pub thirdparty_id_creds: &'a [ThirdpartyIdCredentials],
/// The value of the session key given by the homeserver, if any.
@ -854,3 +868,35 @@ impl OutgoingResponse for UiaaResponse {
}
}
}
fn deserialize_thirdparty_id_creds<'de, D>(deserializer: D) -> Vec<ThirdpartyIdCredentials>
where
D: Deserializer<'de>,
{
use de::value::{MapAccessDeserializer, SeqAccessDeserializer};
struct CredsVisitor;
impl<'de> de::Visitor<'de> for CredsVisitor {
type Value = Vec<ThirdpartyIdCredentials>;
fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
formatter.write_str("an array or object")
}
fn visit_seq<A>(self, seq: A) -> Result<Self::Value, A::Error>
where
A: de::SeqAccess<'de>,
{
<Vec<ThirdpartyIdCredentials>>::deserialize(SeqAccessDeserializer::new(seq))
}
fn visit_map<A>(self, map: A) -> Result<Self::Value, A::Error>
where
A: de::MapAccess<'de>,
{
let creds = ThirdpartyIdCredentials::deserialize(MapAccessDeserializer::new(map))?;
Ok(vec![creds])
}
}
}