feat: update OpenID4VP to WG Draft 20

README.md

@@ -17,7 +17,7 @@ This workspace includes Rust implementations for the following DCP specification
 | Specification      | Description                                | Version
 | -------------------| ------------------------------------------ | -------
 | [OID4VCI](oid4vci) | OpenID for Verifiable Credential Issuance  | [Editor's Draft published: 30 August 2023](https://github.com/openid/OpenID4VCI/blob/111db260b1ad1915ca1462cc4904781beb179972/openid-4-verifiable-credential-issuance-1_0.md)
-| [OID4VP](oid4vp)   | OpenID for Verifiable Presentations        | [Editor's Draft published: 30 August 2023](https://github.com/openid/OpenID4VP/blob/965597ae01fc6e6a2bddc0d6b16f3f6122f3c1ab/openid-4-verifiable-presentations-1_0.md)
+| [OID4VP](oid4vp)   | OpenID for Verifiable Presentations        | [Working Group Draft 20 published: 29 November 2023](https://openid.net/specs/openid-4-verifiable-presentations-1_0-20.html)
 | [SIOPv2](siopv2)   | Self-Issued OpenID Provider v2             | [Editor's Draft published: 24 August 2023](https://github.com/openid/SIOPv2/blob/fb00ab840daa0cec614691b712e28c1f77ed43ea/openid-connect-self-issued-v2-1_0.md)
 
 ### DIF Presentation Exchange

dif-presentation-exchange/src/presentation_definition.rs

@@ -59,8 +59,8 @@ pub enum ClaimFormatDesignation {
 #[derive(Deserialize, Debug, PartialEq, Clone, Serialize)]
 #[serde(rename_all = "snake_case")]
 pub enum ClaimFormatProperty {
-    Alg(Vec<serde_json::Value>),
-    ProofType(Vec<serde_json::Value>),
+    Alg(Vec<String>),
+    ProofType(Vec<String>),
 }
 
 #[allow(dead_code)]
@@ -129,7 +129,7 @@ mod tests {
                     purpose: None,
                     format: Some(HashMap::from_iter(vec![(
                         ClaimFormatDesignation::AcVc,
-                        ClaimFormatProperty::ProofType(vec![serde_json::json!("CLSignature2019")])
+                        ClaimFormatProperty::ProofType(vec!["CLSignature2019".to_string()])
                     )])),
                     constraints: Constraints {
                         limit_disclosure: Some(LimitDisclosure::Required),
@@ -170,7 +170,7 @@ mod tests {
                     purpose: None,
                     format: Some(HashMap::from_iter(vec![(
                         ClaimFormatDesignation::AcVc,
-                        ClaimFormatProperty::ProofType(vec![serde_json::json!("CLSignature2019")])
+                        ClaimFormatProperty::ProofType(vec!["CLSignature2019".to_string()])
                     )])),
                     constraints: Constraints {
                         fields: Some(vec![Field {
@@ -201,7 +201,7 @@ mod tests {
                     purpose: None,
                     format: Some(HashMap::from_iter(vec![(
                         ClaimFormatDesignation::JwtVcJson,
-                        ClaimFormatProperty::ProofType(vec![serde_json::json!("JsonWebSignature2020")])
+                        ClaimFormatProperty::ProofType(vec!["JsonWebSignature2020".to_string()])
                     )])),
                     constraints: Constraints {
                         fields: Some(vec![Field {
@@ -234,7 +234,7 @@ mod tests {
                     purpose: None,
                     format: Some(HashMap::from_iter(vec![(
                         ClaimFormatDesignation::LdpVc,
-                        ClaimFormatProperty::ProofType(vec![serde_json::json!("Ed25519Signature2018")])
+                        ClaimFormatProperty::ProofType(vec!["Ed25519Signature2018".to_string()])
                     )])),
                     constraints: Constraints {
                         fields: Some(vec![Field {
@@ -268,7 +268,7 @@ mod tests {
                     purpose: None,
                     format: Some(HashMap::from_iter(vec![(
                         ClaimFormatDesignation::MsoMdoc,
-                        ClaimFormatProperty::Alg(vec![serde_json::json!("EdDSA"), serde_json::json!("ES256")])
+                        ClaimFormatProperty::Alg(vec!["EdDSA".to_string(), "ES256".to_string()])
                     )])),
                     constraints: Constraints {
                         limit_disclosure: Some(LimitDisclosure::Required),
@@ -321,7 +321,7 @@ mod tests {
                     purpose: None,
                     format: Some(HashMap::from_iter(vec![(
                         ClaimFormatDesignation::LdpVc,
-                        ClaimFormatProperty::ProofType(vec![serde_json::json!("Ed25519Signature2018")])
+                        ClaimFormatProperty::ProofType(vec!["Ed25519Signature2018".to_string()])
                     )])),
                     constraints: Constraints {
                         fields: Some(vec![
@@ -366,7 +366,7 @@ mod tests {
                     purpose: None,
                     format: Some(HashMap::from_iter(vec![(
                         ClaimFormatDesignation::LdpVc,
-                        ClaimFormatProperty::ProofType(vec![serde_json::json!("Ed25519Signature2018")])
+                        ClaimFormatProperty::ProofType(vec!["Ed25519Signature2018".to_string()])
                     )])),
                     constraints: Constraints {
                         fields: Some(vec![Field {

oid4vc-core/src/client_metadata.rs

@@ -1,70 +1,21 @@
-use crate::SubjectSyntaxType;
-use getset::Getters;
 use serde::{Deserialize, Serialize};
 use serde_with::skip_serializing_none;
 use url::Url;
 
-/// [`ClientMetadata`] is a request parameter used by a [`crate::RelyingParty`] to communicate its capabilities to a [`crate::Provider`].
+/// [`ClientMetadata`] is a request parameter used by a [`crate::RelyingParty`] to communicate its capabilities to a
+/// [`crate::Provider`].
 #[skip_serializing_none]
-#[derive(Getters, Debug, PartialEq, Clone, Default, Deserialize, Serialize)]
-pub struct ClientMetadata {
-    // TODO: Move to siopv2 crate.
-    #[getset(get = "pub")]
-    pub subject_syntax_types_supported: Option<Vec<SubjectSyntaxType>>,
-    // TODO: Move to siopv2 crate.
-    #[getset(get = "pub")]
-    pub id_token_signing_alg_values_supported: Option<Vec<String>>,
-    #[getset(get = "pub")]
-    pub client_name: Option<String>,
-    #[getset(get = "pub")]
-    pub logo_uri: Option<Url>,
-}
-
-impl ClientMetadata {
-    pub fn new() -> Self {
-        Self::default()
-    }
-
-    pub fn with_subject_syntax_types_supported(
-        mut self,
-        subject_syntax_types_supported: Vec<SubjectSyntaxType>,
-    ) -> Self {
-        self.subject_syntax_types_supported = Some(subject_syntax_types_supported);
-        self
-    }
-
-    pub fn with_id_token_signing_alg_values_supported(
-        mut self,
-        id_token_signing_alg_values_supported: Vec<String>,
-    ) -> Self {
-        self.id_token_signing_alg_values_supported = Some(id_token_signing_alg_values_supported);
-        self
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::DidMethod;
-    use std::str::FromStr;
-
-    #[test]
-    fn test_client_metadata() {
-        let client_metadata: ClientMetadata = serde_json::from_value(serde_json::json!(
-            {
-                "subject_syntax_types_supported": [
-                    "did:example",
-                    "urn:ietf:params:oauth:jwk-thumbprint"
-                ]
-            }
-        ))
-        .unwrap();
-        assert_eq!(
-            client_metadata,
-            ClientMetadata::default().with_subject_syntax_types_supported(vec![
-                SubjectSyntaxType::Did(DidMethod::from_str("did:example").unwrap()),
-                SubjectSyntaxType::JwkThumbprint,
-            ])
-        );
-    }
+#[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
+#[serde(rename_all = "snake_case")]
+pub enum ClientMetadataEnum<T = ()> {
+    // TODO: Add all fields described in https://www.rfc-editor.org/rfc/rfc7591.html#section-2.
+    ClientMetadata {
+        client_name: Option<String>,
+        logo_uri: Option<Url>,
+        /// As described in [RFC7591](https://www.rfc-editor.org/rfc/rfc7591.html#section-2), the client metadata can be
+        /// expanded with Extensions and profiles.
+        #[serde(flatten)]
+        extension: T,
+    },
+    ClientMetadataUri(String),
 }

oid4vc-manager/tests/siopv2/implicit.rs

@@ -3,12 +3,13 @@ use lazy_static::lazy_static;
 use oid4vc_core::{
     authorization_request::{AuthorizationRequest, ByReference, Object},
     authorization_response::AuthorizationResponse,
-    client_metadata::ClientMetadata,
+    client_metadata::ClientMetadataEnum,
     scope::{Scope, ScopeValue},
     DidMethod, SubjectSyntaxType,
 };
 use oid4vc_manager::{ProviderManager, RelyingPartyManager};
 use siopv2::{
+    authorization_request::ClientMetadataParameters,
     claims::{Address, IndividualClaimRequest},
     siopv2::SIOPv2,
     StandardClaimsRequests, StandardClaimsValues,
@@ -69,13 +70,13 @@ async fn test_implicit_flow() {
         .scope(Scope::from(vec![ScopeValue::OpenId, ScopeValue::Phone]))
         .redirect_uri(format!("{server_url}/redirect_uri").parse::<url::Url>().unwrap())
         .response_mode("direct_post".to_string())
-        .client_metadata(
-            ClientMetadata::default()
-                .with_subject_syntax_types_supported(vec![SubjectSyntaxType::Did(
-                    DidMethod::from_str("did:test").unwrap(),
-                )])
-                .with_id_token_signing_alg_values_supported(vec!["EdDSA".to_string()]),
-        )
+        .client_metadata(ClientMetadataEnum::<ClientMetadataParameters>::ClientMetadata {
+            client_name: None,
+            logo_uri: None,
+            extension: ClientMetadataParameters {
+                subject_syntax_types_supported: vec![SubjectSyntaxType::Did(DidMethod::from_str("did:test").unwrap())],
+            },
+        })
         .claims(
             r#"{
                 "id_token": {

oid4vp/README.md

@@ -5,7 +5,7 @@ Working Group](https://openid.net/wg/digital-credentials-protocols/).
 
 | Specification      | Description                                | Version
 | -------------------| ------------------------------------------ | -------
-| [OID4VP](oid4vp)   | OpenID for Verifiable Presentations        | [Editor's Draft published: 30 August 2023](https://github.com/openid/OpenID4VP/blob/965597ae01fc6e6a2bddc0d6b16f3f6122f3c1ab/openid-4-verifiable-presentations-1_0.md)
+| [OID4VP](oid4vp)   | OpenID for Verifiable Presentations        | [Working Group Draft 20 published: 29 November 2023](https://openid.net/specs/openid-4-verifiable-presentations-1_0-20.html)
 
 
 An overview of all the OpenID Digital Credentials Protocols implementation in Rust can be found [here](../README.md).