feat(edgeagent): adds support for connectionless issuance and present…

…ation

Signed-off-by: goncalo-frade-iohk <[email protected]>

EdgeAgentSDK/Castor/Sources/Resolvers/LongFormPrismDIDResolver.swift

@@ -113,22 +113,22 @@ struct LongFormPrismDIDResolver: DIDResolverDomain {
  )
  }
 
- let decodedPublicKeys = publicKeys.map {
+ let decodedPublicKeys = publicKeys.enumerated().map {
  let didUrl = DIDUrl(
  did: did,
- fragment: $0.id
+ fragment: $0.element.usage.id(index: $0.offset - 1)
  )
 
  let method = DIDDocument.VerificationMethod(
  id: didUrl,
  controller: did,
- type: $0.keyData.getProperty(.curve) ?? "",
- publicKeyMultibase: $0.keyData.raw.base64EncodedString()
+ type: $0.element.keyData.getProperty(.curve) ?? "",
+ publicKeyMultibase: $0.element.keyData.raw.base64EncodedString()
  )
 
  return PublicKeyDecoded(
  id: didUrl.string,
- keyType: .init(usage: $0.usage),
+ keyType: .init(usage: $0.element.usage),
  method: method
  )
  }

EdgeAgentSDK/Castor/Sources/Resolvers/PeerDIDResolver.swift

@@ -203,15 +203,15 @@ extension DIDCore.DIDDocument.VerificationMethod {
 }
 
 extension DIDCore.DIDDocument.Service {
- init(from: AnyCodable) throws {
+ init(from: DIDCore.AnyCodable) throws {
  guard
  let dic = from.value as? [String: Any],
  let id = dic["id"] as? String,
  let type = dic["type"] as? String,
  let serviceEndpoint = dic["serviceEndpoint"]
  else { throw CommonError.invalidCoding(message: "Could not decode service") }
  switch serviceEndpoint {
- case let value as AnyCodable:
+ case let value as DIDCore.AnyCodable:
  self = .init(
  id: id,
  type: type,
@@ -221,26 +221,26 @@ extension DIDCore.DIDDocument.Service {
  self = .init(
  id: id,
  type: type,
- serviceEndpoint: AnyCodable(value)
+ serviceEndpoint: DIDCore.AnyCodable(value)
  )
  case let value as [String: Any]:
  self = .init(
  id: id,
  type: type,
- serviceEndpoint: AnyCodable(value)
+ serviceEndpoint: DIDCore.AnyCodable(value)
  )
  case let value as [String]:
  self = .init(
  id: id,
  type: type,
- serviceEndpoint: AnyCodable(value)
+ serviceEndpoint: DIDCore.AnyCodable(value)
  )
  default:
  throw CommonError.invalidCoding(message: "Could not decode service")
  }
  }
 
- func toAnyCodable() -> AnyCodable {
+ func toAnyCodable() -> DIDCore.AnyCodable {
  AnyCodable(dictionaryLiteral:
  ("id", self.id),
  ("type", self.type),

EdgeAgentSDK/Castor/Tests/DIDParserTests.swift

@@ -1,3 +1,5 @@
+import Apollo
+@testable import Castor
 @testable import Domain
 import XCTest
 

EdgeAgentSDK/Domain/Sources/AnyCodable.swift

@@ -1,27 +1,27 @@
 import Foundation
 
-struct AnyCodable {
- let value: Any
+public struct AnyCodable {
+ public let value: Any
 
- init<T: Codable>(_ value: T) {
+ public init<T: Codable>(_ value: T) {
  self.value = value
  }
 
  init(_ value: Any) {
  self.value = value
  }
 
- func get<T>() -> T? {
+ public func get<T>() -> T? {
  value as? T
  }
 
- func get() -> Any {
+ public func get() -> Any {
  value
  }
 }
 
 extension AnyCodable: Codable {
- init(from decoder: Decoder) throws {
+ public init(from decoder: Decoder) throws {
  let container = try decoder.singleValueContainer()
 
  if container.decodeNil() {
@@ -48,7 +48,7 @@ extension AnyCodable: Codable {
  }
  }
 
- func encode(to encoder: Encoder) throws {
+ public func encode(to encoder: Encoder) throws {
  var container = encoder.singleValueContainer()
 
  switch self.value {
@@ -103,7 +103,7 @@ extension AnyCodable: Codable {
 }
 
 extension AnyCodable: Equatable {
- static func ==(lhs: AnyCodable, rhs: AnyCodable) -> Bool {
+ public static func ==(lhs: AnyCodable, rhs: AnyCodable) -> Bool {
  switch (lhs.value, rhs.value) {
  case is (Void, Void):
  return true
@@ -146,7 +146,7 @@ extension AnyCodable: Equatable {
 }
 
 extension AnyCodable: CustomStringConvertible {
- var description: String {
+ public var description: String {
  switch value {
  case is Void:
  return String(describing: nil as Any?)
@@ -159,7 +159,7 @@ extension AnyCodable: CustomStringConvertible {
 }
 
 extension AnyCodable: CustomDebugStringConvertible {
- var debugDescription: String {
+ public var debugDescription: String {
  switch value {
  case let value as CustomDebugStringConvertible:
  return "AnyCodable(\(value.debugDescription))"
@@ -171,35 +171,35 @@ extension AnyCodable: CustomDebugStringConvertible {
 
 extension AnyCodable: ExpressibleByNilLiteral, ExpressibleByBooleanLiteral, ExpressibleByIntegerLiteral, ExpressibleByFloatLiteral, ExpressibleByStringLiteral, ExpressibleByArrayLiteral, ExpressibleByDictionaryLiteral {
 
- init(nilLiteral: ()) {
+ public init(nilLiteral: ()) {
  self.init(nil ?? ())
  }
 
- init(booleanLiteral value: Bool) {
+ public init(booleanLiteral value: Bool) {
  self.init(value)
  }
 
- init(integerLiteral value: Int) {
+ public init(integerLiteral value: Int) {
  self.init(value)
  }
 
- init(floatLiteral value: Double) {
+ public init(floatLiteral value: Double) {
  self.init(value)
  }
 
- init(extendedGraphemeClusterLiteral value: String) {
+ public init(extendedGraphemeClusterLiteral value: String) {
  self.init(value)
  }
 
- init(stringLiteral value: String) {
+ public init(stringLiteral value: String) {
  self.init(value)
  }
 
- init(arrayLiteral elements: Any...) {
+ public init(arrayLiteral elements: Any...) {
  self.init(elements)
  }
 
- init(dictionaryLiteral elements: (AnyHashable, Any)...) {
+ public init(dictionaryLiteral elements: (AnyHashable, Any)...) {
  self.init(Dictionary<AnyHashable, Any>(elements, uniquingKeysWith: { (first, _) in first }))
  }
 }

EdgeAgentSDK/Domain/Sources/Models/Message+Codable.swift

@@ -4,6 +4,7 @@ extension Message: Codable {
  enum CodingKeys: String, CodingKey {
  case id
  case piuri
+ case type
  case from
  case to
  case fromPrior
@@ -21,7 +22,7 @@ extension Message: Codable {
  public func encode(to encoder: Encoder) throws {
  var container = encoder.container(keyedBy: CodingKeys.self)
  try container.encode(id, forKey: .id)
- try container.encode(piuri, forKey: .piuri)
+ try container.encode(piuri, forKey: .type)
  if let dic = try? JSONSerialization.jsonObject(with: body) as? [String: Any?] {
  var filteredDictionary = dic
  for (key, value) in dic {
@@ -49,7 +50,12 @@ extension Message: Codable {
  public init(from decoder: Decoder) throws {
  let container = try decoder.container(keyedBy: CodingKeys.self)
  let id = try container.decode(String.self, forKey: .id)
- let piuri = try container.decode(String.self, forKey: .piuri)
+ let piuri: String
+ if let type = try container.decodeIfPresent(String.self, forKey: .piuri) {
+ piuri = type
+ } else {
+ piuri = try container.decode(String.self, forKey: .type)
+ }
  let body: Data?
  if 
  let bodyCodable = try? container.decodeIfPresent(AnyCodable.self, forKey: .body),

EdgeAgentSDK/Domain/Sources/Models/MessageAttachment.swift

@@ -96,12 +96,12 @@ public struct AttachmentLinkData: AttachmentData {
 /// The `AttachmentJsonData` struct represents a DIDComm attachment containing JSON data.
 public struct AttachmentJsonData: AttachmentData {
  /// The JSON data associated with the attachment.
- public let data: Data
+ public let json: AnyCodable
 
  /// Initializes a new `AttachmentJsonData` object with the specified properties.
  /// - Parameter data: The JSON data associated with the attachment.
- public init(data: Data) {
- self.data = data
+ public init(json: AnyCodable) {
+ self.json = json
  }
 }
 

EdgeAgentSDK/EdgeAgent/Sources/DIDCommAgent/DIDCommAgent+Credentials.swift

@@ -86,7 +86,7 @@ public extension DIDCommAgent {
  }
  jsonData = decoded
  case let attchedData as AttachmentJsonData:
- jsonData = attchedData.data
+ jsonData = try JSONEncoder.didComm().encode(attchedData.json)
  default:
  throw EdgeAgentError.invalidAttachmentFormat(nil)
  }
@@ -141,7 +141,7 @@ public extension DIDCommAgent {
  }
  jsonData = decoded
  case let attchedData as AttachmentJsonData:
- jsonData = attchedData.data
+ jsonData = try JSONEncoder.didComm().encode(attchedData.json)
  default:
  throw EdgeAgentError.invalidAttachmentFormat(nil)
  }
@@ -210,7 +210,7 @@ public extension DIDCommAgent {
  }
  jsonData = decoded
  case let attchedData as AttachmentJsonData:
- jsonData = attchedData.data
+ jsonData = try JSONEncoder.didComm().encode(attchedData.json)
  default:
  throw EdgeAgentError.invalidAttachmentFormat(nil)
  }

EdgeAgentSDK/EdgeAgent/Sources/DIDCommAgent/DIDCommAgent+Invitations.swift

@@ -18,15 +18,28 @@ public extension DIDCommAgent {
  case onboardingPrism(PrismOnboarding)
  /// Case representing a DIDComm Out-of-Band invitation
  case onboardingDIDComm(OutOfBandInvitation)
+ /// Case representing a DIDComm Connectionless Presentation
+ case connectionlessPresentation(RequestPresentation)
+ /// Case representing a DIDComm Connectionless Issuance
+ case connectionlessIssuance(OfferCredential3_0)
  }
 
  /// Parses the given string as an Out-of-Band invitation
  /// - Parameter url: The string to parse
  /// - Returns: The parsed Out-of-Band invitation
  /// - Throws: `EdgeAgentError` if the string is not a valid URL
  func parseOOBInvitation(url: String) throws -> OutOfBandInvitation {
- guard let url = URL(string: url) else { throw CommonError.invalidURLError(url: url) }
- return try parseOOBInvitation(url: url)
+ guard let messageData = Data(fromBase64URL: url) else {
+ guard let url = URL(string: url) else {
+ throw CommonError.invalidURLError(url: url)
+ }
+ return try parseOOBInvitation(url: url)
+ }
+ let message = try JSONDecoder.didComm().decode(OutOfBandInvitation.self, from: messageData)
+ guard message.type == ProtocolTypes.didcomminvitation.rawValue else {
+ throw EdgeAgentError.unknownInvitationTypeError
+ }
+ return message
  }
 
  /// Parses the given URL as an Out-of-Band invitation
@@ -71,8 +84,26 @@ public extension DIDCommAgent {
  func parseInvitation(str: String) async throws -> InvitationType {
  if let prismOnboarding = try? await parsePrismInvitation(str: str) {
  return .onboardingPrism(prismOnboarding)
- } else if let message = try? parseOOBInvitation(url: str) {
- return .onboardingDIDComm(message)
+ } else if let oobMessage = try? parseOOBInvitation(url: str) {
+ if let attachment = oobMessage.attachments?.first {
+ let invitationType = try await parseAttachmentConnectionlessMessage(oob: oobMessage, attachment: attachment)
+ switch invitationType {
+ case .connectionlessPresentation(let message):
+ try await pluto.storeMessage(
+ message: message.makeMessage(),
+ direction: .received
+ ).first().await()
+ case .connectionlessIssuance(let message):
+ try await pluto.storeMessage(
+ message: message.makeMessage(),
+ direction: .received
+ ).first().await()
+ default:
+ break
+ }
+ return invitationType
+ }
+ return .onboardingDIDComm(oobMessage)
  }
  throw EdgeAgentError.unknownInvitationTypeError
  }
@@ -127,4 +158,35 @@ public extension DIDCommAgent {
  ).run()
  try await connectionManager.addConnection(pair)
  }
+
+ private func parseAttachmentConnectionlessMessage(
+ oob: OutOfBandInvitation,
+ attachment: AttachmentDescriptor
+ ) async throws -> InvitationType {
+ let newDID = try await createNewPeerDID(updateMediator: true)
+ switch attachment.data {
+ case let value as AttachmentJsonData:
+ let normalizeJson = try JSONEncoder.didComm().encode(value.json)
+ let message = try JSONDecoder.didComm().decode(Message.self, from: normalizeJson)
+ if let request = try? RequestPresentation(fromMessage: message, toDID: newDID) {
+ return .connectionlessPresentation(request)
+ }
+ else if let offer = try? OfferCredential3_0(fromMessage: message, toDID: newDID){
+ return .connectionlessIssuance(offer)
+ }
+ return .onboardingDIDComm(oob)
+
+ case let value as AttachmentBase64:
+ let message = try JSONDecoder.didComm().decode(Message.self, from: try value.decoded())
+ if let request = try? RequestPresentation(fromMessage: message, toDID: newDID) {
+ return .connectionlessPresentation(request)
+ }
+ else if let offer = try? OfferCredential3_0(fromMessage: message, toDID: newDID){
+ return .connectionlessIssuance(offer)
+ }
+ return .onboardingDIDComm(oob)
+ default:
+ return .onboardingDIDComm(oob)
+ }
+ }
 }

EdgeAgentSDK/EdgeAgent/Sources/Protocols/Invitation/V2/OutOfBandInvitation.swift

@@ -27,6 +27,7 @@ public struct OutOfBandInvitation: Decodable {
  public let type = ProtocolTypes.didcomminvitation.rawValue
  public let from: String
  public let body: Body
+ public let attachments: [AttachmentDescriptor]?
 
  /**
  Creates a new `OutOfBandInvitation` object.
@@ -42,11 +43,13 @@ public struct OutOfBandInvitation: Decodable {
  init(
  id: String = UUID().uuidString,
  body: Body,
- from: DID
+ from: DID,
+ attachments: [AttachmentDescriptor]? = nil
  ) {
  self.id = id
  self.body = body
  self.from = from.string
+ self.attachments = attachments
  }
 }