Merge pull request #77 from Indicio-tech/fix/didcomm-2.1-service

fix: align with DIDComm v2.1 spec for service endpoints

Author: dbluhm

Diff for: pydid/service.py

@@ -63,7 +63,7 @@ class Config:
         extra = Extra.forbid
 
     type: Literal["DIDCommMessaging"] = "DIDCommMessaging"
-    service_endpoint: List[DIDCommV2ServiceEndpoint]
+    service_endpoint: Union[List[DIDCommV2ServiceEndpoint], DIDCommV2ServiceEndpoint]
 
 
 class UnknownService(Service):

Diff for: tests/test_service.py

@@ -54,6 +54,15 @@
             }
         ],
     },
+    {
+        "id": "did:example:123456789abcdefghi#didcomm-1",
+        "type": "DIDCommMessaging",
+        "serviceEndpoint": {
+            "uri": "https://example.com/path",
+            "accept": ["didcomm/v2", "didcomm/aip2;env=rfc587"],
+            "routingKeys": ["did:example:somemediator#somekey"],
+        },
+    },
 ]
 
 INVALID_SERVICES = [
@@ -172,6 +181,15 @@ def test_serialization(service_raw):
             }
         ],
     },
+    {
+        "id": "did:example:123456789abcdefghi#didcomm-1",
+        "type": "DIDCommMessaging",
+        "serviceEndpoint": {
+            "uri": "https://example.com/path",
+            "accept": ["didcomm/v2", "didcomm/aip2;env=rfc587"],
+            "routingKeys": ["did:example:somemediator#somekey"],
+        },
+    },
 ]
 
 DIDCOMM_INVALID_SERVICES = [

Diff for: tests/test_verification_method.py

@@ -162,6 +162,14 @@ def test_validator_allow_missing_controller():
                 "publicKeyBase58": "12345",
             },
         )
+    with pytest.raises(ValueError):
+        vmethod = VerificationMethod.deserialize(
+            {
+                "id": "hi",
+                "type": "Ed25519Signature2018",
+                "publicKeyBase58": "12345",
+            },
+        )
 
 
 def test_make():