Reorganize typed didcomm service models

Signed-off-by: Patrik Stas <[email protected]>

Author: Patrik-Stas

aries/aries_vcx/src/protocols/did_exchange/state_machine/helpers.rs

@@ -5,7 +5,7 @@ use base64::engine::general_purpose::URL_SAFE_NO_PAD;
 use chrono::Utc;
 use did_doc::schema::{
     did_doc::DidDocument,
-    service::{extra_fields::ServiceKeyKind, typed::didcommv1::ServiceDidCommV1, Service},
+    service::{service_key_kind::ServiceKeyKind, typed::didcommv1::ServiceDidCommV1, Service},
     types::uri::Uri,
     verification_method::{VerificationMethod, VerificationMethodType},
 };

aries/aries_vcx/src/utils/didcomm_utils.rs

@@ -1,5 +1,5 @@
 use did_doc::schema::{
-    did_doc::DidDocument, service::extra_fields::ServiceKeyKind,
+    did_doc::DidDocument, service::service_key_kind::ServiceKeyKind,
     verification_method::VerificationMethodType,
 };
 use public_key::Key;

did_core/did_doc/src/schema/legacy.rs

@@ -205,7 +205,7 @@ pub fn deserialize_legacy_or_new_diddoc_str(val: String) -> Result<DidDocument,
 mod tests {
     use crate::schema::{
         did_doc::DidDocument, legacy::deserialize_legacy_or_new_diddoc_str,
-        service::extra_fields::ServiceKeyKind,
+        service::service_key_kind::ServiceKeyKind,
     };
 
     const LEGACY_DID_DOC_JSON: &str = r#"

did_core/did_doc/src/schema/service/extra_fields/didcommv1.rs

@@ -3,21 +3,17 @@ use std::collections::HashMap;
 use display_as_json::Display;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
+use service_accept_type::ServiceAcceptType;
+use service_key_kind::ServiceKeyKind;
 use url::Url;
 
 use crate::{
     error::DidDocumentBuilderError,
-    schema::{
-        service::{
-            extra_fields::{ServiceAcceptType, ServiceKeyKind},
-            typed::ServiceType,
-        },
-        types::uri::Uri,
-        utils::OneOrList,
-    },
+    schema::{service::typed::ServiceType, types::uri::Uri, utils::OneOrList},
 };
 
-pub mod extra_fields;
+pub mod service_accept_type;
+pub mod service_key_kind;
 pub mod typed;
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Display)]
@@ -171,9 +167,8 @@ mod tests {
 
     use crate::schema::{
         service::{
-            extra_fields::{ServiceAcceptType, ServiceKeyKind},
-            typed::ServiceType,
-            Service,
+            service_accept_type::ServiceAcceptType, service_key_kind::ServiceKeyKind,
+            typed::ServiceType, Service,
         },
         types::uri::Uri,
         utils::OneOrList,

did_core/did_doc/src/schema/service/extra_fields/didcommv2.rs

@@ -0,0 +1,57 @@
+use std::fmt::Display;
+
+use serde::{Deserialize, Deserializer, Serialize};
+
+#[derive(Clone, Debug, Eq, PartialEq, Hash)]
+pub enum ServiceAcceptType {
+    DIDCommV1,
+    DIDCommV2,
+    Other(String),
+}
+
+impl From<&str> for ServiceAcceptType {
+    fn from(s: &str) -> Self {
+        match s {
+            "didcomm/aip2;env=rfc19" => ServiceAcceptType::DIDCommV1,
+            "didcomm/v2" => ServiceAcceptType::DIDCommV2,
+            _ => ServiceAcceptType::Other(s.to_string()),
+        }
+    }
+}
+
+impl Display for ServiceAcceptType {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            ServiceAcceptType::DIDCommV1 => write!(f, "didcomm/aip2;env=rfc19"),
+            ServiceAcceptType::DIDCommV2 => write!(f, "didcomm/v2"),
+            ServiceAcceptType::Other(other) => write!(f, "{}", other),
+        }
+    }
+}
+
+impl<'de> Deserialize<'de> for ServiceAcceptType {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        let s = String::deserialize(deserializer)?;
+        match s.as_str() {
+            "didcomm/aip2;env=rfc19" => Ok(ServiceAcceptType::DIDCommV1),
+            "didcomm/v2" => Ok(ServiceAcceptType::DIDCommV2),
+            _ => Ok(ServiceAcceptType::Other(s)),
+        }
+    }
+}
+
+impl Serialize for ServiceAcceptType {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        match self {
+            ServiceAcceptType::DIDCommV1 => serializer.serialize_str("didcomm/aip2;env=rfc19"),
+            ServiceAcceptType::DIDCommV2 => serializer.serialize_str("didcomm/v2"),
+            ServiceAcceptType::Other(other) => serializer.serialize_str(other),
+        }
+    }
+}

did_core/did_doc/src/schema/service/extra_fields/mod.rs

@@ -0,0 +1,23 @@
+use std::fmt::Display;
+
+use did_key::DidKey;
+use did_parser::DidUrl;
+use serde::{Deserialize, Serialize};
+
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
+#[serde(untagged)]
+pub enum ServiceKeyKind {
+    DidKey(DidKey),
+    Reference(DidUrl),
+    Value(String),
+}
+
+impl Display for ServiceKeyKind {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            ServiceKeyKind::Reference(did_url) => write!(f, "{}", did_url),
+            ServiceKeyKind::Value(value) => write!(f, "{}", value),
+            ServiceKeyKind::DidKey(did_key) => write!(f, "{}", did_key),
+        }
+    }
+}