fix: did service endpoint bug. (#3449)

Signed-off-by: Volodymyr Kubiv <[email protected]>

Signed-off-by: Volodymyr Kubiv <[email protected]>

Author: vkubiv

pkg/doc/did/doc.go

@@ -698,9 +698,7 @@ func populateServices(didID, baseURI string, rawServices []map[string]interface{
 				}
 				coreServices, ok := epEntry.(map[string]interface{}) // DID Core
 				if ok && len(coreServices) > 0 {
-					instances := stringArray(coreServices["instances"])
-					origins := stringArray(coreServices["origins"])
-					sp = model.NewDIDCoreEndpoint(append(instances, origins...))
+					sp = model.NewDIDCoreEndpoint(coreServices)
 				}
 			}
 		}

pkg/doc/did/doc_test.go

@@ -69,6 +69,8 @@ var (
 	validDocV011 string
 	//go:embed testdata/valid_doc_with_base.jsonld
 	validDocWithBase string
+	//go:embed testdata/valid_doc_with_service_endpoint.jsonld
+	validDocWithServiceEndpoint string
 )
 
 func TestParseOfNull(t *testing.T) {
@@ -205,6 +207,17 @@ func TestDocResolution(t *testing.T) {
 		require.Error(t, err)
 		require.Contains(t, err.Error(), ErrDIDDocumentNotExist.Error())
 	})
+
+	t.Run("Parse serialize then parse", func(t *testing.T) {
+		d, err := ParseDocumentResolution([]byte(validDocWithServiceEndpoint))
+		require.NoError(t, err)
+
+		serialized, err := d.JSONBytes()
+		require.NoError(t, err)
+
+		_, err = ParseDocumentResolution(serialized)
+		require.NoError(t, err)
+	})
 }
 
 func TestContextVariations(t *testing.T) {

pkg/doc/did/testdata/valid_doc_with_service_endpoint.jsonld

@@ -0,0 +1 @@
+{"@context":"https://w3id.org/did-resolution/v1","didDocument":{"@context":["https://www.w3.org/ns/did/v1",{"@base":"did:ion:EiAwKfUCtz4_Dw6d6XhRwtftkyuFgkC6BfJfng3R8HBbAA:eyJkZWx0YSI6eyJwYXRjaGVzIjpbeyJhY3Rpb24iOiJhZGQtcHVibGljLWtleXMiLCJwdWJsaWNLZXlzIjpbeyJpZCI6IjE2YmE2YjM4LTE0YjMtNDNjYy1hMGNjLTIyYjdhMTFiOTBmZCIsInB1YmxpY0tleUp3ayI6eyJjcnYiOiJzZWNwMjU2azEiLCJrdHkiOiJFQyIsIngiOiJydGVTVnFIX2pJT3BvNVBseUJDTko2TnhpZjNjM0VPbVB6WWp2Ynp3ajdBIiwieSI6InVFSF9wZGlBOEVRX3phYzhJTS1nSDNCS2ZlQ3FOeUtGM0ppeFFmWnFlX28ifSwicHVycG9zZXMiOlsiYXV0aGVudGljYXRpb24iLCJhc3NlcnRpb25NZXRob2QiXSwidHlwZSI6IkVjZHNhU2VjcDI1NmsxVmVyaWZpY2F0aW9uS2V5MjAxOSJ9XX0seyJhY3Rpb24iOiJhZGQtc2VydmljZXMiLCJzZXJ2aWNlcyI6W3siaWQiOiJMaW5rZWREb21haW5zIiwic2VydmljZUVuZHBvaW50Ijp7Im9yaWdpbnMiOlsiaHR0cDovL3Zjcy53ZWJob29rLmV4YW1wbGUuY29tOjgxODAvIl19LCJ0eXBlIjoiTGlua2VkRG9tYWlucyJ9XX1dLCJ1cGRhdGVDb21taXRtZW50IjoiRWlEYkdDeHFpMWpETW8wUFN1UVp5blVfSy12TmxYZ2RiX0RCbzFXZVQ5aHU4dyJ9LCJzdWZmaXhEYXRhIjp7ImRlbHRhSGFzaCI6IkVpQ01qTEIxY1NZNEEtcHpmWEt6Y2g2WDE5VU5xQmE0UndWQVFkRENDd2hDZmciLCJyZWNvdmVyeUNvbW1pdG1lbnQiOiJFaUF5Y1Z0UUh6OU1EWnZKX0ZON2Fnblh2UlVKT1pucGFOOTNCUk9PUDlXbDFRIn0sInR5cGUiOiJjcmVhdGUifQ"},"https://w3id.org/security/suites/secp256k1-2019/v1"],"assertionMethod":["#16ba6b38-14b3-43cc-a0cc-22b7a11b90fd"],"authentication":["#16ba6b38-14b3-43cc-a0cc-22b7a11b90fd"],"id":"did:ion:EiAwKfUCtz4_Dw6d6XhRwtftkyuFgkC6BfJfng3R8HBbAA:eyJkZWx0YSI6eyJwYXRjaGVzIjpbeyJhY3Rpb24iOiJhZGQtcHVibGljLWtleXMiLCJwdWJsaWNLZXlzIjpbeyJpZCI6IjE2YmE2YjM4LTE0YjMtNDNjYy1hMGNjLTIyYjdhMTFiOTBmZCIsInB1YmxpY0tleUp3ayI6eyJjcnYiOiJzZWNwMjU2azEiLCJrdHkiOiJFQyIsIngiOiJydGVTVnFIX2pJT3BvNVBseUJDTko2TnhpZjNjM0VPbVB6WWp2Ynp3ajdBIiwieSI6InVFSF9wZGlBOEVRX3phYzhJTS1nSDNCS2ZlQ3FOeUtGM0ppeFFmWnFlX28ifSwicHVycG9zZXMiOlsiYXV0aGVudGljYXRpb24iLCJhc3NlcnRpb25NZXRob2QiXSwidHlwZSI6IkVjZHNhU2VjcDI1NmsxVmVyaWZpY2F0aW9uS2V5MjAxOSJ9XX0seyJhY3Rpb24iOiJhZGQtc2VydmljZXMiLCJzZXJ2aWNlcyI6W3siaWQiOiJMaW5rZWREb21haW5zIiwic2VydmljZUVuZHBvaW50Ijp7Im9yaWdpbnMiOlsiaHR0cDovL3Zjcy53ZWJob29rLmV4YW1wbGUuY29tOjgxODAvIl19LCJ0eXBlIjoiTGlua2VkRG9tYWlucyJ9XX1dLCJ1cGRhdGVDb21taXRtZW50IjoiRWlEYkdDeHFpMWpETW8wUFN1UVp5blVfSy12TmxYZ2RiX0RCbzFXZVQ5aHU4dyJ9LCJzdWZmaXhEYXRhIjp7ImRlbHRhSGFzaCI6IkVpQ01qTEIxY1NZNEEtcHpmWEt6Y2g2WDE5VU5xQmE0UndWQVFkRENDd2hDZmciLCJyZWNvdmVyeUNvbW1pdG1lbnQiOiJFaUF5Y1Z0UUh6OU1EWnZKX0ZON2Fnblh2UlVKT1pucGFOOTNCUk9PUDlXbDFRIn0sInR5cGUiOiJjcmVhdGUifQ","service":[{"id":"#LinkedDomains","serviceEndpoint":{"origins":["http://vcs.webhook.example.com:8180/"]},"type":"LinkedDomains"}],"verificationMethod":[{"controller":"did:ion:EiAwKfUCtz4_Dw6d6XhRwtftkyuFgkC6BfJfng3R8HBbAA:eyJkZWx0YSI6eyJwYXRjaGVzIjpbeyJhY3Rpb24iOiJhZGQtcHVibGljLWtleXMiLCJwdWJsaWNLZXlzIjpbeyJpZCI6IjE2YmE2YjM4LTE0YjMtNDNjYy1hMGNjLTIyYjdhMTFiOTBmZCIsInB1YmxpY0tleUp3ayI6eyJjcnYiOiJzZWNwMjU2azEiLCJrdHkiOiJFQyIsIngiOiJydGVTVnFIX2pJT3BvNVBseUJDTko2TnhpZjNjM0VPbVB6WWp2Ynp3ajdBIiwieSI6InVFSF9wZGlBOEVRX3phYzhJTS1nSDNCS2ZlQ3FOeUtGM0ppeFFmWnFlX28ifSwicHVycG9zZXMiOlsiYXV0aGVudGljYXRpb24iLCJhc3NlcnRpb25NZXRob2QiXSwidHlwZSI6IkVjZHNhU2VjcDI1NmsxVmVyaWZpY2F0aW9uS2V5MjAxOSJ9XX0seyJhY3Rpb24iOiJhZGQtc2VydmljZXMiLCJzZXJ2aWNlcyI6W3siaWQiOiJMaW5rZWREb21haW5zIiwic2VydmljZUVuZHBvaW50Ijp7Im9yaWdpbnMiOlsiaHR0cDovL3Zjcy53ZWJob29rLmV4YW1wbGUuY29tOjgxODAvIl19LCJ0eXBlIjoiTGlua2VkRG9tYWlucyJ9XX1dLCJ1cGRhdGVDb21taXRtZW50IjoiRWlEYkdDeHFpMWpETW8wUFN1UVp5blVfSy12TmxYZ2RiX0RCbzFXZVQ5aHU4dyJ9LCJzdWZmaXhEYXRhIjp7ImRlbHRhSGFzaCI6IkVpQ01qTEIxY1NZNEEtcHpmWEt6Y2g2WDE5VU5xQmE0UndWQVFkRENDd2hDZmciLCJyZWNvdmVyeUNvbW1pdG1lbnQiOiJFaUF5Y1Z0UUh6OU1EWnZKX0ZON2Fnblh2UlVKT1pucGFOOTNCUk9PUDlXbDFRIn0sInR5cGUiOiJjcmVhdGUifQ","id":"#16ba6b38-14b3-43cc-a0cc-22b7a11b90fd","publicKeyJwk":{"crv":"secp256k1","kty":"EC","x":"rteSVqH_jIOpo5PlyBCNJ6Nxif3c3EOmPzYjvbzwj7A","y":"uEH_pdiA8EQ_zac8IM-gH3BKfeCqNyKF3JixQfZqe_o"},"type":"EcdsaSecp256k1VerificationKey2019"}]},"didDocumentMetadata":{"equivalentId":["did:ion:EiAwKfUCtz4_Dw6d6XhRwtftkyuFgkC6BfJfng3R8HBbAA"],"method":{"published":false,"recoveryCommitment":"EiAycVtQHz9MDZvJ_FN7agnXvRUJOZnpaN93BROOP9Wl1Q","updateCommitment":"EiDbGCxqi1jDMo0PSuQZynU_K-vNlXgdb_DBo1WeT9hu8w"}}}