feat(sample): Forth batch of sample app code

Apollo/Sources/ApolloImpl+Public.swift

@@ -1,5 +1,6 @@
 import Domain
 import Foundation
+import SwiftJWT
 
 extension ApolloImpl: Apollo {
     public func createRandomMnemonics() -> [String] {
@@ -94,4 +95,25 @@ returns random mnemonics nerver returns invalid mnemonics
         else { throw CommonError.somethingWentWrongError }
         return jsonString
     }
+
+    public func verifyJWT(jwk: String, publicKey: PublicKey) throws -> String {
+        switch publicKey.curve {
+        case "secp256k1":
+            let verifier = JWTVerifier.es256(publicKey: publicKey.value)
+            let decoder = JWTDecoder.init(jwtVerifier: verifier)
+            let jwt = try decoder.decode(JWT<MyClaims>.self, fromString: jwk)
+            return jwk
+        default:
+            let verifier = JWTVerifier.none
+            let decoder = JWTDecoder.init(jwtVerifier: verifier)
+            let jwt = try decoder.decode(JWT<MyClaims>.self, fromString: jwk)
+            return jwk
+        }
+    }
+}
+
+struct MyClaims: Claims {
+    let iss: String
+    let sub: String
+    let exp: Date
 }

Builders/Sources/PolluxBuilder.swift

@@ -0,0 +1,14 @@
+import Pollux
+import Domain
+
+public struct PolluxBuilder {
+    let castor: Castor
+
+    public init(castor: Castor) {
+        self.castor = castor
+    }
+
+    public func build() -> Pollux {
+        PolluxImpl(castor: castor)
+    }
+}

Castor/Tests/PeerDIDCreationTests.swift

@@ -62,11 +62,12 @@ final class PeerDIDCreationTests: XCTestCase {
         let mypeerDID = DID(
             schema: "did",
             method: "peer",
-            methodId: "2.Ez6LSfuJvTtcmcFrjNYYSAuD32tMZWQUD2HYDfXrJqy3ui6MQ.Vz6MkoPyvuxAecSezqmL4ERE7eW2XPbiUEHRH9aqay6LA8Eqr.SeyJ0IjoiZG0iLCJzIjoiaHR0cDovL2hvc3QuZG9ja2VyLmludGVybmFsOjgwL2RpZGNvbW0vIiwiciI6W10sImEiOlsiZGlkY29tbS92MiJdfQ"
+            methodId: "2.Ez6LSms555YhFthn1WV8ciDBpZm86hK9tp83WojJUmxPGk1hZ.Vz6MkmdBjMyB4TS5UbbQw54szm8yvMMf1ftGV2sQVYAxaeWhE.SeyJpZCI6Im5ldy1pZCIsInQiOiJkbSIsInMiOiJodHRwczovL21lZGlhdG9yLnJvb3RzaWQuY2xvdWQiLCJhIjpbImRpZGNvbW0vdjIiXX0"
         )
 
         let apollo = ApolloImpl()
         let castor = CastorImpl(apollo: apollo)
         let document = try await castor.resolveDID(did: mypeerDID)
+        print(document)
     }
 }

Core/Sources/Helpers/First+AsyncAwait.swift

@@ -12,3 +12,12 @@ public extension Publishers.First where Failure == Error {
         throw Publishers.MissingOutputError()
     }
 }
+
+public extension Publishers.FirstWhere where Failure == Error {
+    func await() async throws -> Output {
+        for try await output in values {
+            return output
+        }
+        throw Publishers.MissingOutputError()
+    }
+}

Domain/Sources/BBs/Pollux.swift

@@ -1,5 +1,5 @@
 import Foundation
 
 public protocol Pollux {
-    func parseVerifiableCredential(jsonString: String) throws -> VerifiableCredential
+    func parseVerifiableCredential(jwtString: String) throws -> VerifiableCredential
 }

Domain/Sources/Logging.swift

@@ -37,5 +37,5 @@ public enum LogComponent: String {
     case mercury
     case pluto
     case pollux
-    case experiences
+    case prismAgent
 }

Domain/Sources/Models/Errors.swift

@@ -46,4 +46,5 @@ public enum PlutoError: Error {
 
 public enum PolluxError: Error {
     case invalidCredentialError
+    case invalidJWTString
 }

Domain/Sources/Models/JWTVerifiableCredential+Codable.swift

@@ -14,7 +14,7 @@ extension JWTCredentialPayload.JWTVerfiableCredential: Codable {
 
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
-        try container.encode(self.context, forKey: .context)
+        try? container.encode(self.context, forKey: .context)
         if self.type.count != 1 {
             try container.encode(self.type, forKey: .type)
         } else if let value = self.type.first {
@@ -30,14 +30,14 @@ extension JWTCredentialPayload.JWTVerfiableCredential: Codable {
 
     public init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
-        let context = try container.decode(Set<String>.self, forKey: .context)
+        let context = (try? container.decode(Set<String>.self, forKey: .context)) ?? Set<String>()
         let type: Set<String>
         if let value = try? container.decode(String.self, forKey: .type) {
             type = Set([value])
         } else {
-            type = try container.decode(Set<String>.self, forKey: .type)
+            type = (try? container.decode(Set<String>.self, forKey: .type)) ?? Set<String>()
         }
-        let credentialSubject = try container.decode(String.self, forKey: .credentialSubject)
+        let credentialSubject = try container.decode([String: String].self, forKey: .credentialSubject)
         let credentialStatus = try? container.decode(
             VerifiableCredentialTypeContainer.self,
             forKey: .credentialStatus
@@ -107,10 +107,10 @@ extension JWTCredentialPayload: Codable {
             Date.self,
             forKey: .exp
         )
-        let jti = try container.decode(
+        let jti = (try? container.decode(
             String.self,
             forKey: .jti
-        )
+        )) ?? ""
         let aud = (try? container.decode(
             Set<String>.self,
             forKey: .aud

Domain/Sources/Models/JWTVerifiableCredential.swift

@@ -5,7 +5,7 @@ public struct JWTCredentialPayload {
         public let context: Set<String>
         public let type: Set<String>
         public let credentialSchema: VerifiableCredentialTypeContainer?
-        public let credentialSubject: String
+        public let credentialSubject: [String: String]
         public let credentialStatus: VerifiableCredentialTypeContainer?
         public let refreshService: VerifiableCredentialTypeContainer?
         public let evidence: VerifiableCredentialTypeContainer?
@@ -15,7 +15,7 @@ public struct JWTCredentialPayload {
             context: Set<String> = Set(),
             type: Set<String> = Set(),
             credentialSchema: VerifiableCredentialTypeContainer? = nil,
-            credentialSubject: String,
+            credentialSubject: [String: String],
             credentialStatus: VerifiableCredentialTypeContainer? = nil,
             refreshService: VerifiableCredentialTypeContainer? = nil,
             evidence: VerifiableCredentialTypeContainer? = nil,
@@ -67,7 +67,7 @@ extension JWTCredentialPayload: VerifiableCredential {
     public var issuanceDate: Date { nbf }
     public var expirationDate: Date? { exp }
     public var credentialSchema: VerifiableCredentialTypeContainer? { verifiableCredential.credentialSchema }
-    public var credentialSubject: String { verifiableCredential.credentialSubject }
+    public var credentialSubject: [String: String] { verifiableCredential.credentialSubject }
     public var credentialStatus: VerifiableCredentialTypeContainer? { verifiableCredential.credentialStatus }
     public var refreshService: VerifiableCredentialTypeContainer? { verifiableCredential.refreshService }
     public var evidence: Domain.VerifiableCredentialTypeContainer? { verifiableCredential.evidence }

Domain/Sources/Models/VerifiableCredential.swift

@@ -37,7 +37,7 @@ public protocol VerifiableCredential {
     var issuanceDate: Date { get }
     var expirationDate: Date? { get }
     var credentialSchema: VerifiableCredentialTypeContainer? { get }
-    var credentialSubject: String { get }
+    var credentialSubject: [String: String] { get }
     var credentialStatus: VerifiableCredentialTypeContainer? { get }
     var refreshService: VerifiableCredentialTypeContainer? { get }
     var evidence: VerifiableCredentialTypeContainer? { get }

Domain/Sources/Models/W3CVerifiableCredential+Codable.swift

@@ -62,7 +62,7 @@ extension W3CVerifiableCredential: Codable {
         let validUntil = try? container.decode(VerifiableCredentialTypeContainer.self, forKey: .validUntil)
         let proof = try? container.decode(String.self, forKey: .proof)
         let aud = (try? container.decode(Set<String>.self, forKey: .proof)) ?? Set()
-        let credentialSubject = try container.decode(String.self, forKey: .credentialSubject)
+        let credentialSubject = try container.decode([String: String].self, forKey: .credentialSubject)
         let credentialStatus = try? container.decode(
             VerifiableCredentialTypeContainer.self,
             forKey: .credentialStatus

Domain/Sources/Models/W3CVerifiableCredential.swift

@@ -9,7 +9,7 @@ public struct W3CVerifiableCredential: VerifiableCredential {
     public let issuanceDate: Date
     public let expirationDate: Date?
     public let credentialSchema: VerifiableCredentialTypeContainer?
-    public let credentialSubject: String
+    public let credentialSubject: [String: String]
     public let credentialStatus: VerifiableCredentialTypeContainer?
     public let refreshService: VerifiableCredentialTypeContainer?
     public let evidence: VerifiableCredentialTypeContainer?
@@ -27,7 +27,7 @@ public struct W3CVerifiableCredential: VerifiableCredential {
         issuanceDate: Date,
         expirationDate: Date? = nil,
         credentialSchema: VerifiableCredentialTypeContainer? = nil,
-        credentialSubject: String,
+        credentialSubject: [String: String],
         credentialStatus: VerifiableCredentialTypeContainer? = nil,
         refreshService: VerifiableCredentialTypeContainer? = nil,
         evidence: VerifiableCredentialTypeContainer? = nil,

Mercury/Sources/DIDCommWrappers/DIDCommSecretsResolverWrapper.swift

@@ -70,6 +70,9 @@ extension DIDCommSecretsResolverWrapper: SecretsResolver {
             .map { $0.first { $0.id == secretid } }
             .sink {
                 do {
+                    if $0 == nil {
+                        print("Secret not found: \(secretid)")
+                    }
                     try cb.success(result: $0.map { DIDCommxSwift.Secret(from: $0) })
                 } catch {
                     print(error.localizedDescription)
@@ -92,6 +95,9 @@ extension DIDCommSecretsResolverWrapper: SecretsResolver {
             }
             .sink {
                 do {
+                    if $0.isEmpty {
+                        print("Secrets not found: \(secretids)")
+                    }
                     try cb.success(result: $0)
                 } catch {
                     print(error.localizedDescription)

Mercury/Sources/DIDCommWrappers/PackEncryptedOperation.swift

@@ -27,6 +27,9 @@ final class PackEncryptedOperation: OnPackEncryptedResult {
                     case .finished:
                         break
                     case let .failure(error):
+                        print("Error packing message type:\(msg.piuri)")
+                        print("Error packing message from:\(fromDID.string)")
+                        print("Error packing message to:\(toDID.string)")
                         continuation.resume(throwing: error)
                     }
                 }, receiveValue: {
@@ -41,8 +44,8 @@ final class PackEncryptedOperation: OnPackEncryptedResult {
                     signBy: nil,
                     options: .init(
                         protectSender: false,
-                        forward: true,
-                        forwardHeaders: [:],
+                        forward: false,
+                        forwardHeaders: nil,
                         messagingService: nil,
                         encAlgAuth: .a256cbcHs512Ecdh1puA256kw,
                         encAlgAnon: .xc20pEcdhEsA256kw
@@ -68,6 +71,7 @@ final class PackEncryptedOperation: OnPackEncryptedResult {
     }
 
     func error(err: DIDCommxSwift.ErrorKind, msg: String) {
+        print("Error packing message: \(msg)")
         published.send(completion: .failure(MercuryError.didcommError(msg: msg)))
     }
 }

Mercury/Sources/Helpers/Session.swift

@@ -34,6 +34,7 @@ struct SessionManager {
         let (data, response) = try await session.data(for: request)
         if let urlResponse = response as? HTTPURLResponse {
             guard 200...299 ~= urlResponse.statusCode else {
+                print("HTTP Error: \(urlResponse.statusCode)")
                 throw MercuryError.urlSessionError(
                     statusCode: urlResponse.statusCode,
                     error: nil,

Mercury/Sources/MercuryImpl+Public.swift

@@ -13,14 +13,17 @@ extension MercuryImpl: Mercury {
     }
 
     public func sendMessage(msg: Domain.Message) async throws -> Data? {
+        print("Preparing message of type: \(msg.piuri)")
+        print("From: \(msg.from?.string)")
+        print("to: \(msg.to?.string)")
         guard let toDID = msg.to else { throw MercuryError.noDIDReceiverSetError }
         let document = try await castor.resolveDID(did: toDID)
         guard
             let urlString = document.services.first?.serviceEndpoint.uri,
             let url = URL(string: urlString)
         else { throw MercuryError.noValidServiceFoundError }
         let packedMessage = try await packMessage(msg: msg)
-
+        print("Sending message of type: \(msg.piuri)")
         return try await session.post(
             url: url,
             body: packedMessage.data(using: .utf8),
@@ -33,6 +36,6 @@ extension MercuryImpl: Mercury {
             let msgData = try await sendMessage(msg: msg),
             let msgStr = String(data: msgData, encoding: .utf8)
         else { return nil }
-        return try await self.unpackMessage(msg: msgStr)
+        return try? await self.unpackMessage(msg: msgStr)
     }
 }

Mercury/Sources/MercuryImpl.swift

@@ -11,7 +11,7 @@ public struct MercuryImpl {
 
     public init(
         session: URLSession = .shared,
-        timeout: TimeInterval = 30,
+        timeout: TimeInterval = 999,
         apollo: Apollo,
         castor: Castor,
         pluto: Pluto

Package.swift

@@ -55,7 +55,8 @@ let package = Package(
         .package(url: "https://github.com/antlr/antlr4", branch: "master"),
         .package(url: "https://github.com/input-output-hk/atala-prism-didcomm-swift", from: "0.3.4"),
         .package(url: "https://github.com/input-output-hk/atala-prism-crypto-sdk-sp", from: "1.4.1"),
-        .package(url: "https://github.com/swift-libp2p/swift-multibase", branch: "main")
+        .package(url: "https://github.com/swift-libp2p/swift-multibase", branch: "main"),
+        .package(url:"https://github.com/IBM-Swift/Swift-JWT", from: "4.0.0")
     ],
     targets: [
         .target(
@@ -72,7 +73,8 @@ let package = Package(
             dependencies: [
                 "Domain",
                 "Core",
-                .product(name: "PrismAPI", package: "atala-prism-crypto-sdk-sp")
+                .product(name: "PrismAPI", package: "atala-prism-crypto-sdk-sp"),
+                .product(name: "SwiftJWT", package: "Swift-JWT")
             ],
             path: "Apollo/Sources"
         ),

Pluto/Sources/PersistentStorage/DAO/CDVerifiableCredentialDAO+VerifiableCredentialProvider.swift

@@ -5,7 +5,9 @@ import Domain
 extension CDVerifiableCredentialDAO: VerifiableCredentialProvider {
     func getAll() -> AnyPublisher<[VerifiableCredential], Error> {
         fetchController(context: readContext)
-            .tryMap { try $0.map { try $0.toDomain() } }
+            .tryMap {
+                try $0.map { try $0.toDomain() }
+            }
             .eraseToAnyPublisher()
     }
 
@@ -24,7 +26,7 @@ extension CDVerifiableCredentialDAO: VerifiableCredentialProvider {
 
 extension CDVerifiableCredential {
     func toDomain() throws -> VerifiableCredential {
-        switch self.credentialId {
+        switch self.credentialType {
         case "jwt":
             return try JSONDecoder()
                 .decode(JWTCredentialPayload.self, from: self.verifiableCredetialJson)

Pluto/Sources/PersistentStorage/Models/CDIssueCredentialProtocol+CoreDataClass.swift

@@ -0,0 +1,5 @@
+import CoreData
+import Foundation
+
+@objc(CDIssueCredentialProtocol)
+class CDIssueCredentialProtocol: NSManagedObject {}

Pluto/Sources/PersistentStorage/Models/CDIssueCredentialProtocol+CoreDataProperties.swift

@@ -0,0 +1,16 @@
+import CoreData
+import Foundation
+
+extension CDIssueCredentialProtocol {
+    @nonobjc class func createFetchRequest() -> NSFetchRequest<CDIssueCredentialProtocol> {
+        return NSFetchRequest<CDIssueCredentialProtocol>(entityName: "CDIssueCredentialProtocol")
+    }
+
+    @NSManaged var protocolId: String
+    @NSManaged var threadId: String?
+    @NSManaged var credential: CDVerifiableCredential?
+    @NSManaged var issue: CDMessage?
+    @NSManaged var offer: CDMessage?
+    @NSManaged var propose: CDMessage?
+    @NSManaged var request: CDMessage?
+}

Pluto/Sources/PersistentStorage/Models/CDProofProtocol+CoreDataClass.swift

@@ -0,0 +1,5 @@
+import CoreData
+import Foundation
+
+@objc(CDProofProtocol)
+class CDProofProtocol: NSManagedObject {}

Pluto/Sources/PersistentStorage/Models/CDProofProtocol+CoreDataProperties.swift

@@ -0,0 +1,14 @@
+import CoreData
+import Foundation
+
+extension CDProofProtocol {
+    @nonobjc class func createFetchRequest() -> NSFetchRequest<CDProofProtocol> {
+        return NSFetchRequest<CDProofProtocol>(entityName: "CDProofProtocol")
+    }
+
+    @NSManaged var protocolId: String
+    @NSManaged var threadId: String?
+    @NSManaged var presentation: CDMessage?
+    @NSManaged var propose: CDMessage?
+    @NSManaged var request: CDMessage?
+}