fix: did url string parsing correctly

goncalo-frade-iohk · goncalo-frade-iohk · commit d817858093a3 · 2023-09-01T16:30:13.000+01:00
diff --git a/AtalaPrismSDK/Domain/Sources/Models/DIDUrl.swift b/AtalaPrismSDK/Domain/Sources/Models/DIDUrl.swift
@@ -41,7 +41,7 @@ public struct DIDUrl {
 
     /// A string representation of the path component of this `DIDUrl`.
     private var pathString: String {
-        "/" + path.joined(separator: "/")
+        path.isEmpty ? "" : "/" + path.joined(separator: "/")
     }
 
     /// A string representation of the parameters component of this `DIDUrl`.
diff --git a/AtalaPrismSDK/Mercury/Sources/DIDCommWrappers/DIDCommDIDResolverWrapper.swift b/AtalaPrismSDK/Mercury/Sources/DIDCommWrappers/DIDCommDIDResolverWrapper.swift
@@ -84,7 +84,7 @@ extension DidDoc {
                 id: $0.id.string,
                 type: .jsonWebKey2020,
                 controller: $0.controller.string,
-                verificationMaterial: .jwk(publicKeyJwk: jsonKeys)
+                verificationMaterial: .jwk(value: jsonKeys)
             )
         }
 
@@ -93,9 +93,9 @@ extension DidDoc {
                 return service.serviceEndpoint.first.map {
                     Service(
                         id: service.id,
-                        serviceEndpoint: .didCommMessaging(
+                        kind: .didCommMessaging(
                             value: .init(
-                                uri: $0.uri,
+                                serviceEndpoint: $0.uri,
                                 accept: $0.accept,
                                 routingKeys: $0.routingKeys
                             )
@@ -106,17 +106,17 @@ extension DidDoc {
                 return service.serviceEndpoint.first.map {
                     Service(
                         id: service.id,
-                        serviceEndpoint: .other(value: $0.uri)
+                        kind: .other(value: $0.uri)
                     )
                 }
             }
         }
         self.init(
-            id: did,
-            keyAgreement: keyAgreements,
-            authentication: authentications,
-            verificationMethod: verificationMethods,
-            service: services
+            did: did,
+            keyAgreements: keyAgreements,
+            authentications: authentications,
+            verificationMethods: verificationMethods,
+            services: services
         )
     }
 }
diff --git a/AtalaPrismSDK/Mercury/Sources/DIDCommWrappers/DIDCommSecretsResolverWrapper.swift b/AtalaPrismSDK/Mercury/Sources/DIDCommWrappers/DIDCommSecretsResolverWrapper.swift
@@ -172,7 +172,7 @@ extension DIDCommxSwift.Secret {
 
         switch from.secretMaterial {
         case let .jwk(value):
-            material = .jwk(privateKeyJwk: value)
+            material = .jwk(value: value)
         }
         self.init(
             id: from.id,

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public struct DIDUrl {`
`41`	`41`
`42`	`42`	/// A string representation of the path component of this `DIDUrl`.
`43`	`43`	`private var pathString: String {`
`44`		`- "/" + path.joined(separator: "/")`
	`44`	`+ path.isEmpty ? "" : "/" + path.joined(separator: "/")`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	/// A string representation of the parameters component of this `DIDUrl`.
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ extension DidDoc {`
`84`	`84`	`id: $0.id.string,`
`85`	`85`	`type: .jsonWebKey2020,`
`86`	`86`	`controller: $0.controller.string,`
`87`		`- verificationMaterial: .jwk(publicKeyJwk: jsonKeys)`
	`87`	`+ verificationMaterial: .jwk(value: jsonKeys)`
`88`	`88`	`)`
`89`	`89`	`}`
`90`	`90`
`@@ -93,9 +93,9 @@ extension DidDoc {`
`93`	`93`	`return service.serviceEndpoint.first.map {`
`94`	`94`	`Service(`
`95`	`95`	`id: service.id,`
`96`		`- serviceEndpoint: .didCommMessaging(`
	`96`	`+ kind: .didCommMessaging(`
`97`	`97`	`value: .init(`
`98`		`- uri: $0.uri,`
	`98`	`+ serviceEndpoint: $0.uri,`
`99`	`99`	`accept: $0.accept,`
`100`	`100`	`routingKeys: $0.routingKeys`
`101`	`101`	`)`
`@@ -106,17 +106,17 @@ extension DidDoc {`
`106`	`106`	`return service.serviceEndpoint.first.map {`
`107`	`107`	`Service(`
`108`	`108`	`id: service.id,`
`109`		`- serviceEndpoint: .other(value: $0.uri)`
	`109`	`+ kind: .other(value: $0.uri)`
`110`	`110`	`)`
`111`	`111`	`}`
`112`	`112`	`}`
`113`	`113`	`}`
`114`	`114`	`self.init(`
`115`		`- id: did,`
`116`		`- keyAgreement: keyAgreements,`
`117`		`- authentication: authentications,`
`118`		`- verificationMethod: verificationMethods,`
`119`		`- service: services`
	`115`	`+ did: did,`
	`116`	`+ keyAgreements: keyAgreements,`
	`117`	`+ authentications: authentications,`
	`118`	`+ verificationMethods: verificationMethods,`
	`119`	`+ services: services`
`120`	`120`	`)`
`121`	`121`	`}`
`122`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ extension DIDCommxSwift.Secret {`
`172`	`172`
`173`	`173`	`switch from.secretMaterial {`
`174`	`174`	`case let .jwk(value):`
`175`		`- material = .jwk(privateKeyJwk: value)`
	`175`	`+ material = .jwk(value: value)`
`176`	`176`	`}`
`177`	`177`	`self.init(`
`178`	`178`	`id: from.id,`